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

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

Issue 453023002: Revert of Enable HTMLMediaElement@autoplay on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 command_line.AppendSwitch(switches::kProcessPerTab); 140 command_line.AppendSwitch(switches::kProcessPerTab);
141 command_line.AppendSwitch(switches::kEnableLogging); 141 command_line.AppendSwitch(switches::kEnableLogging);
142 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles); 142 command_line.AppendSwitch(switches::kAllowFileAccessFromFiles);
143 command_line.AppendSwitchASCII(switches::kUseGL, 143 command_line.AppendSwitchASCII(switches::kUseGL,
144 gfx::kGLImplementationOSMesaName); 144 gfx::kGLImplementationOSMesaName);
145 command_line.AppendSwitch(switches::kSkipGpuDataLoading); 145 command_line.AppendSwitch(switches::kSkipGpuDataLoading);
146 command_line.AppendSwitchASCII(switches::kTouchEvents, 146 command_line.AppendSwitchASCII(switches::kTouchEvents,
147 switches::kTouchEventsEnabled); 147 switches::kTouchEventsEnabled);
148 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0"); 148 command_line.AppendSwitchASCII(switches::kForceDeviceScaleFactor, "1.0");
149 #if defined(OS_ANDROID)
150 command_line.AppendSwitch(
151 switches::kDisableGestureRequirementForMediaPlayback);
152 #endif
149 153
150 if (!command_line.HasSwitch(switches::kStableReleaseMode)) { 154 if (!command_line.HasSwitch(switches::kStableReleaseMode)) {
151 command_line.AppendSwitch( 155 command_line.AppendSwitch(
152 switches::kEnableExperimentalWebPlatformFeatures); 156 switches::kEnableExperimentalWebPlatformFeatures);
153 } 157 }
154 158
155 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) { 159 if (!command_line.HasSwitch(switches::kEnableThreadedCompositing)) {
156 command_line.AppendSwitch(switches::kDisableThreadedCompositing); 160 command_line.AppendSwitch(switches::kDisableThreadedCompositing);
157 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation); 161 command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
158 command_line.AppendSwitch(switches::kDisableImplSidePainting); 162 command_line.AppendSwitch(switches::kDisableImplSidePainting);
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 browser_client_.reset(new ShellContentBrowserClient); 298 browser_client_.reset(new ShellContentBrowserClient);
295 return browser_client_.get(); 299 return browser_client_.get();
296 } 300 }
297 301
298 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 302 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
299 renderer_client_.reset(new ShellContentRendererClient); 303 renderer_client_.reset(new ShellContentRendererClient);
300 return renderer_client_.get(); 304 return renderer_client_.get();
301 } 305 }
302 306
303 } // namespace content 307 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/web_preferences.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698