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

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

Issue 1134473003: bluetooth: Add a WebBluetooth command line flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add to flag to histogram Created 5 years, 7 months 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
« no previous file with comments | « content/public/common/content_switches.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 switches::kTouchEventsEnabled); 166 switches::kTouchEventsEnabled);
167 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 167 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
168 #if defined(OS_ANDROID) 168 #if defined(OS_ANDROID)
169 command_line.AppendSwitch( 169 command_line.AppendSwitch(
170 switches::kDisableGestureRequirementForMediaPlayback); 170 switches::kDisableGestureRequirementForMediaPlayback);
171 #endif 171 #endif
172 172
173 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { 173 if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
174 command_line.AppendSwitch( 174 command_line.AppendSwitch(
175 switches::kEnableExperimentalWebPlatformFeatures); 175 switches::kEnableExperimentalWebPlatformFeatures);
176 // Only enable WebBluetooth during Layout Tests in non release mode.
177 command_line.AppendSwitch(switches::kEnableWebBluetooth);
176 } 178 }
177 179
178 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { 180 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) {
179 command_line.AppendSwitch(switches::kDisableThreadedCompositing); 181 command_line.AppendSwitch(switches::kDisableThreadedCompositing);
180 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); 182 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
181 // Text blobs are normally disabled when kDisableImplSidePainting is 183 // Text blobs are normally disabled when kDisableImplSidePainting is
182 // present to ensure correct LCD behavior, but for layout tests we want 184 // present to ensure correct LCD behavior, but for layout tests we want
183 // them on because LCD is always suppressed. 185 // them on because LCD is always suppressed.
184 command_line.AppendSwitch(switches::kForceTextBlobs); 186 command_line.AppendSwitch(switches::kForceTextBlobs);
185 } 187 }
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 340 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
339 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( 341 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
340 switches::kRunLayoutTest) 342 switches::kRunLayoutTest)
341 ? new LayoutTestContentRendererClient 343 ? new LayoutTestContentRendererClient
342 : new ShellContentRendererClient); 344 : new ShellContentRendererClient);
343 345
344 return renderer_client_.get(); 346 return renderer_client_.get();
345 } 347 }
346 348
347 } // namespace content 349 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/content_switches.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698