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

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

Issue 2467913002: Touch event flag should control only DOM event firing. (Closed)
Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into patchtoflags 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 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 command_line.AppendSwitch(switches::kProcessPerTab); 166 command_line.AppendSwitch(switches::kProcessPerTab);
167 command_line.AppendSwitch(switches::kEnableLogging); 167 command_line.AppendSwitch(switches::kEnableLogging);
168 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); 168 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
169 // only default to osmesa if the flag isn't already specified. 169 // only default to osmesa if the flag isn't already specified.
170 if (!command_line.HasSwitch(switches::kUseGpuInTests) && 170 if (!command_line.HasSwitch(switches::kUseGpuInTests) &&
171 !command_line.HasSwitch(switches::kUseGL)) { 171 !command_line.HasSwitch(switches::kUseGL)) {
172 command_line.AppendSwitchASCII(switches::kUseGL, 172 command_line.AppendSwitchASCII(switches::kUseGL,
173 gl::kGLImplementationOSMesaName); 173 gl::kGLImplementationOSMesaName);
174 } 174 }
175 command_line.AppendSwitch(switches::kSkipGpuDataLoading); 175 command_line.AppendSwitch(switches::kSkipGpuDataLoading);
176 command_line.AppendSwitchASCII(switches::kTouchEvents,
177 switches::kTouchEventsEnabled);
178 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor)) 176 if (!command_line.HasSwitch(switches::kForceDeviceScaleFactor))
179 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 177 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
180 command_line.AppendSwitch( 178 command_line.AppendSwitch(
181 switches::kDisableGestureRequirementForMediaPlayback); 179 switches::kDisableGestureRequirementForMediaPlayback);
182 180
183 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { 181 if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
184 command_line.AppendSwitch( 182 command_line.AppendSwitch(
185 switches::kEnableExperimentalWebPlatformFeatures); 183 switches::kEnableExperimentalWebPlatformFeatures);
186 } 184 }
187 185
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 364
367 return renderer_client_.get(); 365 return renderer_client_.get();
368 } 366 }
369 367
370 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { 368 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() {
371 utility_client_.reset(new ShellContentUtilityClient); 369 utility_client_.reset(new ShellContentUtilityClient);
372 return utility_client_.get(); 370 return utility_client_.get();
373 } 371 }
374 372
375 } // namespace content 373 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698