Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 2437943002: Ship WebBluetooth out of origin trial (Closed)
Patch Set: address more comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/app/shell_main_delegate.h" 5 #include "content/shell/app/shell_main_delegate.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/cpu.h" 9 #include "base/cpu.h"
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 command_line.AppendSwitchASCII(switches::kTouchEvents, 176 command_line.AppendSwitchASCII(switches::kTouchEvents,
177 switches::kTouchEventsEnabled); 177 switches::kTouchEventsEnabled);
178 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) 178 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor))
179 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 179 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
180 command_line.AppendSwitch( 180 command_line.AppendSwitch(
181 switches::kDisableGestureRequirementForMediaPlayback); 181 switches::kDisableGestureRequirementForMediaPlayback);
182 182
183 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { 183 if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
184 command_line.AppendSwitch( 184 command_line.AppendSwitch(
185 switches::kEnableExperimentalWebPlatformFeatures); 185 switches::kEnableExperimentalWebPlatformFeatures);
186 // Only enable WebBluetooth during Layout Tests in non release mode.
187 command_line.AppendSwitch(switches::kEnableWebBluetooth);
188 } 186 }
189 187
190 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { 188 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) {
191 command_line.AppendSwitch(switches::kDisableThreadedCompositing); 189 command_line.AppendSwitch(switches::kDisableThreadedCompositing);
192 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); 190 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
193 } 191 }
194 192
195 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) { 193 if (!command_line.HasSwitch(switches::kEnableDisplayList2dCanvas)) {
196 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); 194 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas);
197 } 195 }
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 366
369 return renderer_client_.get(); 367 return renderer_client_.get();
370 } 368 }
371 369
372 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
373 utility_client_.reset(new ShellContentUtilityClient); 371 utility_client_.reset(new ShellContentUtilityClient);
374 return utility_client_.get(); 372 return utility_client_.get();
375 } 373 }
376 374
377 } // namespace content 375 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698