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

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

Issue 2547373002: Rename TouchEventAPI to TouchEventFeatureDetection (Closed)
Patch Set: Update histograms.xml Created 4 years 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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 command_line.AppendSwitch(switches::kProcessPerTab); 167 command_line.AppendSwitch(switches::kProcessPerTab);
168 command_line.AppendSwitch(switches::kEnableLogging); 168 command_line.AppendSwitch(switches::kEnableLogging);
169 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); 169 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
170 // only default to osmesa if the flag isn't already specified. 170 // only default to osmesa if the flag isn't already specified.
171 if (!command_line.HasSwitch(switches::kUseGpuInTests) && 171 if (!command_line.HasSwitch(switches::kUseGpuInTests) &&
172 !command_line.HasSwitch(switches::kUseGL)) { 172 !command_line.HasSwitch(switches::kUseGL)) {
173 command_line.AppendSwitchASCII(switches::kUseGL, 173 command_line.AppendSwitchASCII(switches::kUseGL,
174 gl::kGLImplementationOSMesaName); 174 gl::kGLImplementationOSMesaName);
175 } 175 }
176 command_line.AppendSwitch(switches::kSkipGpuDataLoading); 176 command_line.AppendSwitch(switches::kSkipGpuDataLoading);
177 command_line.AppendSwitchASCII(switches::kTouchEvents, 177 command_line.AppendSwitchASCII(
178 switches::kTouchEventsEnabled); 178 switches::kTouchEventFeatureDetection,
179 switches::kTouchEventFeatureDetectionEnabled);
179 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) 180 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor))
180 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 181 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
181 command_line.AppendSwitch( 182 command_line.AppendSwitch(
182 switches::kDisableGestureRequirementForMediaPlayback); 183 switches::kDisableGestureRequirementForMediaPlayback);
183 184
184 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { 185 if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
185 command_line.AppendSwitch( 186 command_line.AppendSwitch(
186 switches::kEnableExperimentalWebPlatformFeatures); 187 switches::kEnableExperimentalWebPlatformFeatures);
187 } 188 }
188 189
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 368
368 return renderer_client_.get(); 369 return renderer_client_.get();
369 } 370 }
370 371
371 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 372 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
372 utility_client_.reset(new ShellContentUtilityClient); 373 utility_client_.reset(new ShellContentUtilityClient);
373 return utility_client_.get(); 374 return utility_client_.get();
374 } 375 }
375 376
376 } // namespace content 377 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698