summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-08 02:12:21 +0000
committerkoz@chromium.org <koz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-08 02:12:21 +0000
commit5e5671a2f3b2b33c5a28ae76692afc6187a7b1dc (patch)
treeb5fac16d515670416318cb380bc68aae681b4088 /content
parenta03403cd905774a57c99805c0fc44d725200077b (diff)
downloadchromium_src-5e5671a2f3b2b33c5a28ae76692afc6187a7b1dc.zip
chromium_src-5e5671a2f3b2b33c5a28ae76692afc6187a7b1dc.tar.gz
chromium_src-5e5671a2f3b2b33c5a28ae76692afc6187a7b1dc.tar.bz2
Change enable-fullscreen flag to disable-fullscreen.
BUG=73923 TEST=Chrome should have the JS Fullscreen API enabled by default, and starting chrome with --disable-fullscreen should turn it off. Review URL: http://codereview.chromium.org/7826028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100076 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/browser_render_process_host.cc2
-rw-r--r--content/common/content_switches.cc2
-rw-r--r--content/common/content_switches.h2
-rw-r--r--content/renderer/render_thread.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index fdc276b..1fe037d 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -564,7 +564,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer(
switches::kEnableGPUClientLogging,
switches::kEnableLogging,
switches::kEnableMediaStream,
- switches::kEnableFullScreen,
+ switches::kDisableFullScreen,
switches::kEnablePepperTesting,
#if defined(OS_MACOSX)
// Allow this to be set when invoking the browser and relayed along.
diff --git a/content/common/content_switches.cc b/content/common/content_switches.cc
index 5223533..31d4b93 100644
--- a/content/common/content_switches.cc
+++ b/content/common/content_switches.cc
@@ -186,7 +186,7 @@ const char kEnableDNSCertProvenanceChecking[] =
const char kEnableDeviceMotion[] = "enable-device-motion";
// Enable the JavaScript Full Screen API.
-const char kEnableFullScreen[] = "enable-fullscreen";
+const char kDisableFullScreen[] = "disable-fullscreen";
// Enable the GPU plugin and Pepper 3D rendering.
const char kEnableGPUPlugin[] = "enable-gpu-plugin";
diff --git a/content/common/content_switches.h b/content/common/content_switches.h
index d798740..07e1c97 100644
--- a/content/common/content_switches.h
+++ b/content/common/content_switches.h
@@ -67,7 +67,7 @@ extern const char kEnableAccessibilityLogging[];
extern const char kEnableBenchmarking[];
extern const char kEnableDNSCertProvenanceChecking[];
extern const char kEnableDeviceMotion[];
-extern const char kEnableFullScreen[];
+extern const char kDisableFullScreen[];
extern const char kEnableGPUPlugin[];
extern const char kEnableLogging[];
extern const char kEnableMediaStream[];
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 19522d5..4556c2f 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -474,7 +474,7 @@ void RenderThread::EnsureWebKitInitialized() {
command_line.HasSwitch(switches::kEnableMediaStream));
WebKit::WebRuntimeFeatures::enableFullScreenAPI(
- command_line.HasSwitch(switches::kEnableFullScreen));
+ !command_line.HasSwitch(switches::kDisableFullScreen));
#if defined(OS_CHROMEOS)
// TODO(crogers): enable once Web Audio has been tested and optimized.