Make Chromium disable the fullscreen API if --enable-fullscreen is absent from

the command line.


BUG=82954


Review URL: http://codereview.chromium.org/7744016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98362 0039d316-1c4b-4281-b951-d872f2087c98

chrome/common/chrome_switches.cc

@@ -443,9 +443,6 @@ const char kEnableFastback[]                = "enable-fastback";
 // testing, for example page cycler and layout tests.  See bug 1157243.
 const char kEnableFileCookies[]             = "enable-file-cookies";
 
-// Enable the JavaScript Full Screen API.
-const char kEnableFullScreen[]              = "enable-fullscreen";
-
 // Enable the in-browser thumbnailing, which is more efficient than the
 // in-renderer thumbnailing, as we can use more information to determine
 // if we need to update thumbnails.

chrome/common/chrome_switches.h

@@ -130,7 +130,6 @@ extern const char kEnableExperimentalExtensionApis[];
 extern const char kEnableExtensionTimelineApi[];
 extern const char kEnableFastback[];
 extern const char kEnableFileCookies[];
-extern const char kEnableFullScreen[];
 extern const char kEnableInBrowserThumbnailing[];
 extern const char kEnableInlineWebstoreInstall[];
 extern const char kEnableIPv6[];

content/browser/renderer_host/browser_render_process_host.cc

@@ -561,6 +561,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
     switches::kEnableGPUClientLogging,
     switches::kEnableLogging,
     switches::kEnableMediaStream,
+    switches::kEnableFullScreen,
     switches::kEnablePepperTesting,
 #if defined(OS_MACOSX)
     // Allow this to be set when invoking the browser and relayed along.

content/common/content_switches.cc

@@ -165,6 +165,9 @@ const char kEnableBenchmarking[]            = "enable-benchmarking";
 // Enables device motion events.
 const char kEnableDeviceMotion[]            = "enable-device-motion";
 
+// Enable the JavaScript Full Screen API.
+const char kEnableFullScreen[]              = "enable-fullscreen";
+
 // Enable the GPU plugin and Pepper 3D rendering.
 const char kEnableGPUPlugin[]               = "enable-gpu-plugin";
 

content/common/content_switches.h

@@ -61,6 +61,7 @@ extern const char kEnableAcceleratedPlugins[];
 extern const char kEnableAccessibility[];
 extern const char kEnableBenchmarking[];
 extern const char kEnableDeviceMotion[];
+extern const char kEnableFullScreen[];
 extern const char kEnableGPUPlugin[];
 extern const char kEnableLogging[];
 extern const char kEnableMediaStream[];

content/renderer/render_thread.cc

@@ -473,6 +473,9 @@ void RenderThread::EnsureWebKitInitialized() {
   WebKit::WebRuntimeFeatures::enableMediaStream(
       command_line.HasSwitch(switches::kEnableMediaStream));
 
+  WebKit::WebRuntimeFeatures::enableFullScreenAPI(
+      command_line.HasSwitch(switches::kEnableFullScreen));
+
 #if defined(OS_CHROMEOS)
   // TODO(crogers): enable once Web Audio has been tested and optimized.
   WebRuntimeFeatures::enableWebAudio(false);