diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 22947f0b45331..4700b5a05296a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -140,7 +140,6 @@
#include "ui/message_center/message_center_util.h"
#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/common/webpreferences.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "chrome/browser/chrome_browser_main_win.h"
diff --git a/chrome/browser/chromeos/login/chrome_restart_request.cc b/chrome/browser/chromeos/login/chrome_restart_request.cc
index 94bd1b5c4c580..f6b14b58136eb 100644
--- a/chrome/browser/chromeos/login/chrome_restart_request.cc
+++ b/chrome/browser/chromeos/login/chrome_restart_request.cc
@@ -40,7 +40,6 @@
#include "ui/gl/gl_switches.h"
#include "ui/views/corewm/corewm_switches.h"
#include "url/gurl.h"
-#include "webkit/plugins/plugin_switches.h"
using content::BrowserThread;
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc
index 14ed4df725214..bb3e5b11f31b0 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.cc
+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -34,7 +34,6 @@
#include "ui/gl/gl_switches.h"
#include "ui/gl/gpu_switching_manager.h"
#include "webkit/common/webpreferences.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_MACOSX)
#include <ApplicationServices/ApplicationServices.h>
diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc
index ddb5683027960..c1dfa1f1953e1 100644
--- a/content/browser/plugin_browsertest.cc
+++ b/content/browser/plugin_browsertest.cc
@@ -15,7 +15,6 @@
#include "content/test/content_browser_test_utils.h"
#include "content/test/net/url_request_mock_http_job.h"
#include "ui/gfx/rect.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "base/win/registry.h"
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc
index f440be405b71e..c9aa6994660f5 100644
--- a/content/browser/ppapi_plugin_process_host.cc
+++ b/content/browser/ppapi_plugin_process_host.cc
@@ -25,7 +25,6 @@
#include "net/base/network_change_notifier.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ui/base/ui_base_switches.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "content/common/sandbox_win.h"
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index faf4171c25552..1f6492b54e26f 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -132,7 +132,6 @@
#include "ui/gl/gl_switches.h"
#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
#include "webkit/common/resource_type.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_ANDROID)
#include "content/browser/android/vibration_message_filter.h"
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index db062c531db43..2e562188d24d2 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -27,7 +27,6 @@
#include "content/utility/utility_thread_impl.h"
#include "ipc/ipc_switches.h"
#include "ui/base/ui_base_switches.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "content/public/common/sandboxed_process_launcher_delegate.h"
diff --git a/content/common/plugin_list.cc b/content/common/plugin_list.cc
index 79f8cc56b7ac6..69102c5c68fd4 100644
--- a/content/common/plugin_list.cc
+++ b/content/common/plugin_list.cc
@@ -13,9 +13,9 @@
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
+#include "content/public/common/content_switches.h"
#include "net/base/mime_util.h"
#include "url/gurl.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "content/common/plugin_constants_win.h"
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 2315729d40a4f..73d51ad7c3193 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -23,6 +23,7 @@
#include "content/ppapi_plugin/plugin_process_dispatcher.h"
#include "content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h"
#include "content/public/common/content_client.h"
+#include "content/public/common/content_switches.h"
#include "content/public/common/pepper_plugin_info.h"
#include "content/public/common/sandbox_init.h"
#include "content/public/plugin/content_plugin_client.h"
@@ -39,7 +40,6 @@
#include "ppapi/shared_impl/api_id.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "ui/base/ui_base_switches.h"
-#include "webkit/plugins/plugin_switches.h"
#if defined(OS_WIN)
#include "base/win/win_util.h"
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index c0ee261d906c2..07c6ff3f38656 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -10,18 +10,33 @@ namespace switches {
// override for developers who need the old behavior for testing.
const char kAllowFileAccessFromFiles[] = "allow-file-access-from-files";
+// Enables the sandboxed processes to run without a job object assigned to them.
+// This flag is required to allow Chrome to run in RemoteApps or Citrix. This
+// flag can reduce the security of the sandboxed processes and allow them to do
+// certain API calls like shut down Windows or access the clipboard. Also we
+// lose the chance to kill some processes until the outer job that owns them
+// finishes.
+const char kAllowNoSandboxJob[] = "allow-no-sandbox-job";
+
// Allows debugging of sandboxed processes (see zygote_main_linux.cc).
const char kAllowSandboxDebugging[] = "allow-sandbox-debugging";
// Allow compositing on chrome:// pages.
const char kAllowWebUICompositing[] = "allow-webui-compositing";
+// The same as kAuditHandles except all handles are enumerated.
+const char kAuditAllHandles[] = "enable-handle-auditing-all";
+
// Enumerates and prints a child process' most dangerous handles when it
// is terminated.
const char kAuditHandles[] = "enable-handle-auditing";
-// The same as kAuditHandles except all handles are enumerated.
-const char kAuditAllHandles[] = "enable-handle-auditing-all";
+// Blacklist the GPU for accelerated compositing.
+const char kBlacklistAcceleratedCompositing[] =
+ "blacklist-accelerated-compositing";
+
+// Blacklist the GPU for WebGL.
+const char kBlacklistWebGL[] = "blacklist-webgl";
// Causes the browser process to throw an assertion on startup.
const char kBrowserAssertTest[] = "assert-test";
@@ -32,6 +47,16 @@ const char kBrowserCrashTest[] = "crash-test";
// Path to the exe to run for the renderer and plugin subprocesses.
const char kBrowserSubprocessPath[] = "browser-subprocess-path";
+// Dumps extra logging about plugin loading to the log file.
+const char kDebugPluginLoading[] = "debug-plugin-loading";
+
+// Sets the tile size used by composited layers.
+const char kDefaultTileWidth[] = "default-tile-width";
+const char kDefaultTileHeight[] = "default-tile-height";
+
+// Disable antialiasing on 2d canvas.
+const char kDisable2dCanvasAntialiasing[] = "disable-canvas-aa";
+
// Disables client-visible 3D APIs, in particular WebGL and Pepper 3D.
// This is controlled by policy and is kept separate from the other
// enable/disable switches to avoid accidentally regressing the policy
@@ -41,25 +66,31 @@ const char kDisable3DAPIs[] = "disable-3d-apis";
// Disable gpu-accelerated 2d canvas.
const char kDisableAccelerated2dCanvas[] = "disable-accelerated-2d-canvas";
-// Disable antialiasing on 2d canvas.
-const char kDisable2dCanvasAntialiasing[] = "disable-canvas-aa";
-
-// Enable experimental canvas features, e.g. canvas 2D context attributes
-const char kEnableExperimentalCanvasFeatures[]
- = "enable-experimental-canvas-features";
-
// Disables accelerated compositing.
const char kDisableAcceleratedCompositing[] = "disable-accelerated-compositing";
+// Disables accelerated compositing for backgrounds of root layers with
+// background-attachment: fixed.
+const char kDisableAcceleratedFixedRootBackground[] =
+ "disable-accelerated-fixed-root-background";
+
// Disables the hardware acceleration of 3D CSS and animation.
const char kDisableAcceleratedLayers[] = "disable-accelerated-layers";
+// Disables accelerated compositing for overflow scroll.
+const char kDisableAcceleratedOverflowScroll[] =
+ "disable-accelerated-overflow-scroll";
+
// Disables the hardware acceleration of plugins.
const char kDisableAcceleratedPlugins[] = "disable-accelerated-plugins";
// Disables GPU accelerated video display.
const char kDisableAcceleratedVideo[] = "disable-accelerated-video";
+// Disables hardware acceleration of video decode, where available.
+const char kDisableAcceleratedVideoDecode[] =
+ "disable-accelerated-video-decode";
+
// Disables the alternate window station for the renderer.
const char kDisableAltWinstation[] = "disable-winsta";
@@ -74,9 +105,24 @@ const char kDisableAudio[] = "disable-audio";
// users with many windows/tabs and lots of memory.
const char kDisableBackingStoreLimit[] = "disable-backing-store-limit";
+// Enables browser plugin compositing experiment.
+const char kDisableBrowserPluginCompositing[] =
+ "disable-browser-plugin-compositing";
+
+// See comment for kEnableCompositingForFixedPosition.
+const char kDisableCompositingForFixedPosition[] =
+ "disable-fixed-position-compositing";
+
+// See comment for kEnableCompositingForTransition.
+const char kDisableCompositingForTransition[] =
+ "disable-transition-compositing";
+
// Disables HTML5 DB support.
const char kDisableDatabases[] = "disable-databases";
+// Disables delegated renderer.
+const char kDisableDelegatedRenderer[] = "disable-delegated-renderer";
+
// Disables desktop notifications (default enabled on windows).
const char kDisableDesktopNotifications[] = "disable-desktop-notifications";
@@ -86,28 +132,40 @@ const char kDisableDeviceOrientation[] = "disable-device-orientation";
// Disable experimental WebGL support.
const char kDisableExperimentalWebGL[] = "disable-webgl";
-// Blacklist the GPU for accelerated compositing.
-const char kBlacklistAcceleratedCompositing[] =
- "blacklist-accelerated-compositing";
-
-// Blacklist the GPU for WebGL.
-const char kBlacklistWebGL[] = "blacklist-webgl";
-
// Disable FileSystem API.
const char kDisableFileSystem[] = "disable-file-system";
+const char kDisableFixedPositionCreatesStackingContext[]
+ = "disable-fixed-position-creates-stacking-context";
+
// Disable 3D inside of flapper.
const char kDisableFlash3d[] = "disable-flash-3d";
// Disable Stage3D inside of flapper.
const char kDisableFlashStage3d[] = "disable-flash-stage3d";
+// This flag disables force compositing mode and prevents it from being enabled
+// via field trials.
+const char kDisableForceCompositingMode[] = "disable-force-compositing-mode";
+
+// Disable the JavaScript Full Screen API.
+const char kDisableFullScreen[] = "disable-fullscreen";
+
// Suppresses support for the Geolocation javascript API.
const char kDisableGeolocation[] = "disable-geolocation";
+const char kDisableGestureTapHighlight[] = "disable-gesture-tap-highlight";
+
// Disable GL multisampling.
const char kDisableGLMultisampling[] = "disable-gl-multisampling";
+// Disables GPU hardware acceleration. If software renderer is not in place,
+// then the GPU process won't launch.
+const char kDisableGpu[] = "disable-gpu";
+
+// Prevent the compositor from using its GPU implementation.
+const char kDisableGpuCompositing[] = "disable-gpu-compositing";
+
// Do not launch the GPU process shortly after browser process launch. Instead
// launch it when it is first needed.
const char kDisableGpuProcessPrelaunch[] = "disable-gpu-process-prelaunch";
@@ -115,41 +173,34 @@ const char kDisableGpuProcessPrelaunch[] = "disable-gpu-process-prelaunch";
// Disable the GPU process sandbox.
const char kDisableGpuSandbox[] = "disable-gpu-sandbox";
-// Reduces the GPU process sandbox to be less strict.
-const char kReduceGpuSandbox[] = "reduce-gpu-sandbox";
+// Disable the thread that crashes the GPU process if it stops responding to
+// messages.
+const char kDisableGpuWatchdog[] = "disable-gpu-watchdog";
// Suppresses hang monitor dialogs in renderer processes. This may allow slow
// unload handlers on a page to prevent the tab from closing, but the Task
// Manager can be used to terminate the offending process in this case.
const char kDisableHangMonitor[] = "disable-hang-monitor";
-// Disables HTML-based desktop notifications.
-const char kDisableHTMLNotifications[] = "disable-html-notifications";
-
// Disable the RenderThread's HistogramCustomizer.
const char kDisableHistogramCustomizer[] = "disable-histogram-customizer";
+// Disables HTML-based desktop notifications.
+const char kDisableHTMLNotifications[] = "disable-html-notifications";
+
// Disable the use of an ImageTransportSurface. This means the GPU process
// will present the rendered page rather than the browser process.
const char kDisableImageTransportSurface[] = "disable-image-transport-surface";
-// Use hardware gpu, if available, for tests.
-const char kUseGpuInTests[] = "use-gpu-in-tests";
-
-// Disables GPU hardware acceleration. If software renderer is not in place,
-// then the GPU process won't launch.
-const char kDisableGpu[] = "disable-gpu";
-
-// Disable the thread that crashes the GPU process if it stops responding to
-// messages.
-const char kDisableGpuWatchdog[] = "disable-gpu-watchdog";
-
// Prevent Java from running.
const char kDisableJava[] = "disable-java";
// Don't execute JavaScript (browser JS like the new tab page still runs).
const char kDisableJavaScript[] = "disable-javascript";
+// Disables prefixed Encrypted Media API (e.g. webkitGenerateKeyRequest()).
+const char kDisableLegacyEncryptedMedia[] = "disable-legacy-encrypted-media";
+
// Disable LocalStorage.
const char kDisableLocalStorage[] = "disable-local-storage";
@@ -157,13 +208,20 @@ const char kDisableLocalStorage[] = "disable-local-storage";
// builds.
const char kDisableLogging[] = "disable-logging";
-// Enables displaying net log events on the command line, or writing the events
-// to a separate file if a file name is given.
-const char kLogNetLog[] = "log-net-log";
+// Disable Pepper3D.
+const char kDisablePepper3d[] = "disable-pepper-3d";
+
+// Disables compositor-accelerated touch-screen pinch gestures.
+const char kDisablePinch[] = "disable-pinch";
// Prevent plugins from running.
const char kDisablePlugins[] = "disable-plugins";
+// Disable discovering third-party plug-ins. Effectively loading only
+// ones shipped with the browser plus third-party ones as specified by
+// --extra-plugin-dir and --load-plugin switches.
+const char kDisablePluginsDiscovery[] = "disable-plugins-discovery";
+
// Disables remote web font support. SVG font should always work whether this
// option is specified or not.
const char kDisableRemoteFonts[] = "disable-remote-fonts";
@@ -171,12 +229,6 @@ const char kDisableRemoteFonts[] = "disable-remote-fonts";
// Turns off the accessibility in the renderer.
const char kDisableRendererAccessibility[] = "disable-renderer-accessibility";
-// Disable False Start in SSL and TLS connections.
-const char kDisableSSLFalseStart[] = "disable-ssl-false-start";
-
-// Disable smooth scrolling for testing.
-const char kDisableSmoothScrolling[] = "disable-smooth-scrolling";
-
// Disable the seccomp filter sandbox (seccomp-bpf) (Linux only).
const char kDisableSeccompFilterSandbox[] = "disable-seccomp-filter-sandbox";
@@ -192,63 +244,33 @@ const char kDisableSharedWorkers[] = "disable-shared-workers";
// Disables site-specific tailoring to compatibility issues in WebKit.
const char kDisableSiteSpecificQuirks[] = "disable-site-specific-quirks";
+// Disable smooth scrolling for testing.
+const char kDisableSmoothScrolling[] = "disable-smooth-scrolling";
+
+// Disables the use of a 3D software rasterizer.
+const char kDisableSoftwareRasterizer[] = "disable-software-rasterizer";
+
// Disables speech input.
const char kDisableSpeechInput[] = "disable-speech-input";
-// Specifies the request key for the continuous speech recognition webservice.
-const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";
+// Disable False Start in SSL and TLS connections.
+const char kDisableSSLFalseStart[] = "disable-ssl-false-start";
-// Enables the synthesis part of the Web Speech API.
-const char kEnableSpeechSynthesis[] = "enable-speech-synthesis";
+// Disable multithreaded GPU compositing of web content.
+const char kDisableThreadedCompositing[] = "disable-threaded-compositing";
-#if defined(OS_ANDROID)
-// WebRTC is enabled by default on Android.
-const char kDisableWebRTC[] = "disable-webrtc";
-
-// Enable the recognition part of the Web Speech API.
-const char kEnableSpeechRecognition[] = "enable-speech-recognition";
-
-#endif
+// Disables the threaded HTML parser in WebKit
+const char kDisableThreadedHTMLParser[] = "disable-threaded-html-parser";
// Disable web audio API.
const char kDisableWebAudio[] = "disable-webaudio";
-#if defined(ENABLE_WEBRTC)
-// Enables WebRTC AEC recordings.
-const char kEnableWebRtcAecRecordings[] = "enable-webrtc-aec-recordings";
-
-// Enable WebRTC DataChannels SCTP wire protocol support.
-const char kEnableSCTPDataChannels[] = "enable-sctp-data-channels";
-
-// Disable WebRTC device enumeration.
-const char kDisableDeviceEnumeration[] = "disable-device-enumeration";
-
-#endif
-
-// Enable WebRTC to open TCP server sockets.
-const char kEnableWebRtcTcpServerSocket[] = "enable-webrtc-tcp-server-socket";
-
-// Enables HW decode acceleration for WebRTC.
-const char kEnableWebRtcHWDecoding[] = "enable-webrtc-hw-decoding";
-
-// Enable CSS Transitions / Animations on the Web Animations model.
-const char kEnableWebAnimationsCSS[] = "enable-web-animations-css";
-
-// Enable SVG Animations on the Web Animations model.
-const char kEnableWebAnimationsSVG[] = "enable-web-animations-svg";
-
-// Enables Web MIDI API.
-const char kEnableWebMIDI[] = "enable-web-midi";
+// Disables prefixed Media Source API (i.e., the WebKitMediaSource object).
+const char kDisableWebKitMediaSource[] = "disable-webkit-media-source";
// Don't enforce the same-origin policy. (Used by people testing their sites.)
const char kDisableWebSecurity[] = "disable-web-security";
-// Enable an experimental WebSocket implementation.
-const char kEnableExperimentalWebSocket[] = "enable-experimental-websocket";
-
-// Enable HTML Imports
-extern const char kEnableHTMLImports[] = "enable-html-imports";
-
// Disables WebKit's XSSAuditor. The XSSAuditor mitigates reflective XSS.
const char kDisableXSSAuditor[] = "disable-xss-auditor";
@@ -258,16 +280,24 @@ const char kDisableXSSAuditor[] = "disable-xss-auditor";
// based tests.
const char kDomAutomationController[] = "dom-automation";
-// Specifies if the |StatsCollectionController| needs to be bound in the
-// renderer. This binding happens on per-frame basis and hence can potentially
-// be a performance bottleneck. One should only enable it when running a test
-// that needs to access the provided statistics.
-const char kStatsCollectionController[] =
- "enable-stats-collection-bindings";
-
// Enable gpu-accelerated SVG/W3C filters.
const char kEnableAcceleratedFilters[] = "enable-accelerated-filters";
+// Enables accelerated compositing for backgrounds of root layers with
+// background-attachment: fixed. Requires kForceCompositingMode.
+const char kEnableAcceleratedFixedRootBackground[] =
+ "enable-accelerated-fixed-root-background";
+
+// Enables accelerated compositing for overflow scroll. Promotes eligible
+// overflow:scroll elements to layers to enable accelerated scrolling for them.
+const char kEnableAcceleratedOverflowScroll[] =
+ "enable-accelerated-overflow-scroll";
+
+// Enables accelerated compositing for scrollable frames for accelerated
+// scrolling for them. Requires kForceCompositingMode.
+const char kEnableAcceleratedScrollableFrames[] =
+ "enable-accelerated-scrollable-frames";
+
// Turns on extremely verbose logging of accessibility events.
const char kEnableAccessibilityLogging[] = "enable-accessibility-logging";
@@ -275,11 +305,13 @@ const char kEnableAccessibilityLogging[] = "enable-accessibility-logging";
//
// TODO(miu): Remove --enable-audible-notifications once the feature goes
// live. http://crbug.com/178934
-const char kEnableAudibleNotifications[] = "enable-audible-notifications";
+const char kEnableAudibleNotifications[] = "enable-audible-notifications";
-// Enables browser plugin compositing experiment.
-const char kDisableBrowserPluginCompositing[] =
- "disable-browser-plugin-compositing";
+// Use a begin frame signal from browser to renderer to schedule rendering.
+const char kEnableBeginFrameScheduling[] = "enable-begin-frame-scheduling";
+
+// Synchronize delivery and response of input events to and from the renderer.
+const char kEnableBrowserInputController[] = "enable-browser-input-controller";
// Enables browser plugin for all types of pages.
const char kEnableBrowserPluginForAllViewTypes[] =
@@ -289,7 +321,12 @@ const char kEnableBrowserPluginForAllViewTypes[] =
// kEnableBrowserPluginGuestViews must also be set at this time.
const char kEnableBrowserPluginDragDrop[] = "enable-browser-plugin-drag-drop";
-// Enable/Disable the creation of compositing layers for fixed position
+// Enables accelerated scrolling by the compositor for frames. Requires
+// kForceCompositingMode and kEnableAcceleratedScrollableFrames.
+const char kEnableCompositedScrollingForFrames[] =
+ "enable-composited-scrolling-for-frames";
+
+// Enable the creation of compositing layers for fixed position
// elements. Three options are needed to support four possible scenarios:
// 1. Default (disabled)
// 2. Enabled always (to allow dogfooding)
@@ -301,10 +338,6 @@ const char kEnableBrowserPluginDragDrop[] = "enable-browser-plugin-drag-drop";
// override Option #4.
const char kEnableCompositingForFixedPosition[] =
"enable-fixed-position-compositing";
-const char kDisableCompositingForFixedPosition[] =
- "disable-fixed-position-compositing";
-const char kEnableHighDpiCompositingForFixedPosition[] =
- "enable-high-dpi-fixed-position-compositing";
// Enable/Disable the creation of compositing layers for RenderLayers with a
// transition on a property that supports accelerated animation (that is,
@@ -315,14 +348,12 @@ const char kEnableHighDpiCompositingForFixedPosition[] =
// 3. Disabled always.
const char kEnableCompositingForTransition[] =
"enable-transition-compositing";
-const char kDisableCompositingForTransition[] =
- "disable-transition-compositing";
// Enables CSS3 custom filters
const char kEnableCssShaders[] = "enable-css-shaders";
-// Disables delegated renderer.
-const char kDisableDelegatedRenderer[] = "disable-delegated-renderer";
+// Defer image decoding in WebKit until painting.
+const char kEnableDeferredImageDecoding[] = "enable-deferred-image-decoding";
// Enables delegated renderer.
const char kEnableDelegatedRenderer[] = "enable-delegated-renderer";
@@ -330,40 +361,33 @@ const char kEnableDelegatedRenderer[] = "enable-delegated-renderer";
// Enables device motion events.
const char kEnableDeviceMotion[] = "enable-device-motion";
-#if defined(OS_ANDROID)
-// Disables device motion events.
-const char kDisableDeviceMotion[] = "disable-device-motion";
-#endif
-
// Enables restarting interrupted downloads.
const char kEnableDownloadResumption[] = "enable-download-resumption";
+// Enables support for Encrypted Media Extensions (e.g. MediaKeys).
+const char kEnableEncryptedMedia[] = "enable-encrypted-media";
+
+// Enable experimental canvas features, e.g. canvas 2D context attributes
+const char kEnableExperimentalCanvasFeatures[] =
+ "enable-experimental-canvas-features";
+
// Enables Web Platform features that are in development.
const char kEnableExperimentalWebPlatformFeatures[] =
"enable-experimental-web-platform-features";
-// Enables the CSS multicol implementation that uses the regions implementation.
-const char kEnableRegionBasedColumns[] =
- "enable-region-based-columns";
-
-// Disables the threaded HTML parser in WebKit
-const char kDisableThreadedHTMLParser[] = "disable-threaded-html-parser";
+// Enable an experimental WebSocket implementation.
+const char kEnableExperimentalWebSocket[] = "enable-experimental-websocket";
// By default, a page is laid out to fill the entire width of the window.
// This flag fixes the layout of the page to a default of 980 CSS pixels,
// or to a specified width and height using --enable-fixed-layout=w,h
const char kEnableFixedLayout[] = "enable-fixed-layout";
-// Disable the JavaScript Full Screen API.
-const char kDisableFullScreen[] = "disable-fullscreen";
-
-// Enable Text Service Framework(TSF) for text inputting instead of IMM32. This
-// flag is ignored on Metro environment.
-const char kEnableTextServicesFramework[] = "enable-text-services-framework";
+const char kEnableFixedPositionCreatesStackingContext[]
+ = "enable-fixed-position-creates-stacking-context";
// Enable Gesture Tap Highlight
-const char kEnableGestureTapHighlight[] = "enable-gesture-tap-highlight";
-const char kDisableGestureTapHighlight[] = "disable-gesture-tap-highlight";
+const char kEnableGestureTapHighlight[] = "enable-gesture-tap-highlight";
// Enables the GPU benchmarking extension
const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking";
@@ -371,34 +395,22 @@ const char kEnableGpuBenchmarking[] = "enable-gpu-benchmarking";
// Enables TRACE for GL calls in the renderer.
const char kEnableGpuClientTracing[] = "enable-gpu-client-tracing";
+// See comment for kEnableCompositingForFixedPosition.
+const char kEnableHighDpiCompositingForFixedPosition[] =
+ "enable-high-dpi-fixed-position-compositing";
+
+// Enable HTML Imports
+extern const char kEnableHTMLImports[] = "enable-html-imports";
+
// Enables support for inband text tracks in media content.
-const char kEnableInbandTextTracks[] = "enable-inband-text-tracks";
-
-// Enables the memory benchmarking extension
-const char kEnableMemoryBenchmarking[] = "enable-memory-benchmarking";
-
-// Enables the Skia benchmarking extension
-const char kEnableSkiaBenchmarking[] = "enable-skia-benchmarking";
+const char kEnableInbandTextTracks[] = "enable-inband-text-tracks";
// Force logging to be enabled. Logging is disabled by default in release
// builds.
const char kEnableLogging[] = "enable-logging";
-// Disables prefixed Media Source API (i.e., the WebKitMediaSource object).
-const char kDisableWebKitMediaSource[] = "disable-webkit-media-source";
-
-// Enables support for Encrypted Media Extensions (e.g. MediaKeys).
-const char kEnableEncryptedMedia[] = "enable-encrypted-media";
-
-// Disables prefixed Encrypted Media API (e.g. webkitGenerateKeyRequest()).
-const char kDisableLegacyEncryptedMedia[] = "disable-legacy-encrypted-media";
-
-// Use fake device for MediaStream to replace actual camera and microphone.
-const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream";
-
-// Bypass the media stream infobar by selecting the default device for media
-// streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream.
-const char kUseFakeUIForMediaStream[] = "use-fake-ui-for-media-stream";
+// Enables the memory benchmarking extension
+const char kEnableMemoryBenchmarking[] = "enable-memory-benchmarking";
// On Windows, converts the page to the currently-installed monitor profile.
// This does NOT enable color management for images. The source is still
@@ -409,13 +421,15 @@ const char kEnableMonitorProfile[] = "enable-monitor-profile";
// http://crbug.com/260005
const char kEnableNewMediaInternals[] = "enable-new-media-internals";
-// Enables compositor-accelerated touch-screen pinch gestures.
-const char kEnablePinch[] = "enable-pinch";
-const char kDisablePinch[] = "disable-pinch";
-
// Enables use of cache if offline, even if it's stale
const char kEnableOfflineCacheAccess[] = "enable-offline-cache-access";
+// Forward overscroll event data from the renderer to the browser.
+const char kEnableOverscrollNotifications[] = "enable-overscroll-notifications";
+
+// Enables compositor-accelerated touch-screen pinch gestures.
+const char kEnablePinch[] = "enable-pinch";
+
// Enable caching of pre-parsed JS script data. See http://crbug.com/32407.
const char kEnablePreparsedJsCaching[] = "enable-preparsed-js-caching";
@@ -428,23 +442,32 @@ const char kEnablePrivilegedWebGLExtensions[] =
const char kEnablePruneGpuCommandBuffers[] =
"enable-prune-gpu-command-buffers";
-// Enable screen capturing support for MediaStream API.
-const char kEnableUserMediaScreenCapturing[] =
- "enable-usermedia-screen-capturing";
-
-// Enables TLS cached info extension.
-const char kEnableSSLCachedInfo[] = "enable-ssl-cached-info";
+// Enables the CSS multicol implementation that uses the regions implementation.
+const char kEnableRegionBasedColumns[] =
+ "enable-region-based-columns";
// Cause the OS X sandbox write to syslog every time an access to a resource
// is denied by the sandbox.
const char kEnableSandboxLogging[] = "enable-sandbox-logging";
-// Enable spatial navigation
-const char kEnableSpatialNavigation[] = "enable-spatial-navigation";
+// Enables the Skia benchmarking extension
+const char kEnableSkiaBenchmarking[] = "enable-skia-benchmarking";
// On platforms that support it, enables smooth scroll animation.
const char kEnableSmoothScrolling[] = "enable-smooth-scrolling";
+// Allow the compositor to use its software implementation if GL fails.
+const char kEnableSoftwareCompositing[] = "enable-software-compositing";
+
+// Enable spatial navigation
+const char kEnableSpatialNavigation[] = "enable-spatial-navigation";
+
+// Enables the synthesis part of the Web Speech API.
+const char kEnableSpeechSynthesis[] = "enable-speech-synthesis";
+
+// Enables TLS cached info extension.
+const char kEnableSSLCachedInfo[] = "enable-ssl-cached-info";
+
// Enables StatsTable, logging statistics to a global named shared memory table.
const char kEnableStatsTable[] = "enable-stats-table";
@@ -460,29 +483,51 @@ const char kEnableStatsTable[] = "enable-stats-table";
// cookies on cross-site requests.
const char kEnableStrictSiteIsolation[] = "enable-strict-site-isolation";
-// Enable multithreaded GPU compositing of web content.
-const char kEnableThreadedCompositing[] = "enable-threaded-compositing";
-
-// Allow GL contexts to be automatically virtualized (shared between command
-// buffer clients) if they are compatible.
-const char kEnableVirtualGLContexts[] = "enable-virtual-gl-contexts";
-
-// Disable multithreaded GPU compositing of web content.
-const char kDisableThreadedCompositing[] = "disable-threaded-compositing";
-
// Enable use of experimental TCP sockets API for sending data in the
// SYN packet.
const char kEnableTcpFastOpen[] = "enable-tcp-fastopen";
-// Disables hardware acceleration of video decode, where available.
-const char kDisableAcceleratedVideoDecode[] =
- "disable-accelerated-video-decode";
+// Enable Text Service Framework(TSF) for text inputting instead of IMM32. This
+// flag is ignored on Metro environment.
+const char kEnableTextServicesFramework[] = "enable-text-services-framework";
+
+// Enable multithreaded GPU compositing of web content.
+const char kEnableThreadedCompositing[] = "enable-threaded-compositing";
+
+// Enable screen capturing support for MediaStream API.
+const char kEnableUserMediaScreenCapturing[] =
+ "enable-usermedia-screen-capturing";
// Enables the use of the viewport meta tag, which allows
// pages to control aspects of their own layout. This also turns on touch-screen
// pinch gestures.
const char kEnableViewport[] = "enable-viewport";
+// Allow GL contexts to be automatically virtualized (shared between command
+// buffer clients) if they are compatible.
+const char kEnableVirtualGLContexts[] = "enable-virtual-gl-contexts";
+
+// Enables moving cursor by word in visual order.
+const char kEnableVisualWordMovement[] = "enable-visual-word-movement";
+
+// Enable the Vtune profiler support.
+const char kEnableVtune[] = "enable-vtune-support";
+
+// Enable CSS Transitions / Animations on the Web Animations model.
+const char kEnableWebAnimationsCSS[] = "enable-web-animations-css";
+
+// Enable SVG Animations on the Web Animations model.
+const char kEnableWebAnimationsSVG[] = "enable-web-animations-svg";
+
+// Enables WebGL extensions not yet approved by the community.
+const char kEnableWebGLDraftExtensions[] = "enable-webgl-draft-extensions";
+
+// Enables Web MIDI API.
+const char kEnableWebMIDI[] = "enable-web-midi";
+
+// Enable WebRTC to open TCP server sockets.
+const char kEnableWebRtcTcpServerSocket[] = "enable-webrtc-tcp-server-socket";
+
// Enables experimental features for the geolocation API.
// Current features:
// - CoreLocation support for Mac OS X 10.6
@@ -490,14 +535,13 @@ const char kEnableViewport[] = "enable-viewport";
// - Location platform support for Windows 7
const char kExperimentalLocationFeatures[] = "experimental-location-features";
+// Load NPAPI plugins from the specified directory.
+const char kExtraPluginDir[] = "extra-plugin-dir";
+
// If accelerated compositing is supported, always enter compositing mode for
// the base layer even when compositing is not strictly required.
const char kForceCompositingMode[] = "force-compositing-mode";
-// This flag disables force compositing mode and prevents it from being enabled
-// via field trials.
-const char kDisableForceCompositingMode[] = "disable-force-compositing-mode";
-
// Some field trials may be randomized in the browser, and the randomly selected
// outcome needs to be propagated to the renderer. For instance, this is used
// to modify histograms recorded in the renderer, or to get the renderer to
@@ -513,12 +557,6 @@ const char kForceFieldTrials[] = "force-fieldtrials";
// overrides this if present.
const char kForceRendererAccessibility[] = "force-renderer-accessibility";
-// Allow the compositor to use its software implementation if GL fails.
-const char kEnableSoftwareCompositing[] = "enable-software-compositing";
-
-// Prevent the compositor from using its GPU implementation.
-const char kDisableGpuCompositing[] = "disable-gpu-compositing";
-
// Passes gpu device_id from browser process to GPU process.
const char kGpuDeviceID[] = "gpu-device-id";
@@ -544,12 +582,6 @@ const char kGpuStartupDialog[] = "gpu-startup-dialog";
// Passes gpu vendor_id from browser process to GPU process.
const char kGpuVendorID[] = "gpu-vendor-id";
-#if defined(OS_ANDROID)
-// Don't display any scrollbars. This is useful for Android WebView where
-// the system manages the scrollbars instead.
-const char kHideScrollbars[] = "hide-scrollbars";
-#endif
-
// These mappings only apply to the host resolver.
const char kHostResolverRules[] = "host-resolver-rules";
@@ -568,24 +600,24 @@ const char kInProcessPlugins[] = "in-process-plugins";
// Specifies the flags passed to JS engine
const char kJavaScriptFlags[] = "js-flags";
-// Load NPAPI plugins from the specified directory.
-const char kExtraPluginDir[] = "extra-plugin-dir";
-
// Load an NPAPI plugin from the specified path.
const char kLoadPlugin[] = "load-plugin";
-// Disable discovering third-party plug-ins. Effectively loading only
-// ones shipped with the browser plus third-party ones as specified by
-// --extra-plugin-dir and --load-plugin switches.
-const char kDisablePluginsDiscovery[] = "disable-plugins-discovery";
-
// Sets the minimum log level. Valid values are from 0 to 3:
// INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
const char kLoggingLevel[] = "log-level";
+// Enables displaying net log events on the command line, or writing the events
+// to a separate file if a file name is given.
+const char kLogNetLog[] = "log-net-log";
+
// Make plugin processes log their sent and received messages to VLOG(1).
const char kLogPluginMessages[] = "log-plugin-messages";
+// Sets the width and height above which a composited layer will get tiled.
+const char kMaxUntiledLayerHeight[] = "max-untiled-layer-height";
+const char kMaxUntiledLayerWidth[] = "max-untiled-layer-width";
+
// Sample memory usage with high frequency and store the results to the
// Renderer.Memory histogram. Used in memory tests.
const char kMemoryMetrics[] = "memory-metrics";
@@ -600,13 +632,11 @@ const char kNoReferrers[] = "no-referrers";
// Disables the sandbox for all process types that are normally sandboxed.
const char kNoSandbox[] = "no-sandbox";
-// Enables the sandboxed processes to run without a job object assigned to them.
-// This flag is required to allow Chrome to run in RemoteApps or Citrix. This
-// flag can reduce the security of the sandboxed processes and allow them to do
-// certain API calls like shut down Windows or access the clipboard. Also we
-// lose the chance to kill some processes until the outer job that owns them
-// finishes.
-const char kAllowNoSandboxJob[] = "allow-no-sandbox-job";
+// Enables or disables history navigation in response to horizontal overscroll.
+// Set the value to '1' to enable the feature, and set to '0' to disable.
+// Defaults to enabled.
+const char kOverscrollHistoryNavigation[] =
+ "overscroll-history-navigation";
// Specifies a command that should be used to launch the plugin process. Useful
// for running the plugin process through purify or quantify. Ex:
@@ -625,6 +655,9 @@ const char kPluginStartupDialog[] = "plugin-startup-dialog";
// Argument to the process type that indicates a PPAPI broker process type.
const char kPpapiBrokerProcess[] = "ppapi-broker";
+// "Command-line" arguments for the PPAPI Flash; used for debugging options.
+const char kPpapiFlashArgs[] = "ppapi-flash-args";
+
// Runs PPAPI (Pepper) plugins in-process.
const char kPpapiInProcess[] = "ppapi-in-process";
@@ -654,17 +687,16 @@ const char kProcessPerTab[] = "process-per-tab";
// renderer or plugin host. If it's empty, it's the browser.
const char kProcessType[] = "type";
+// Reduces the GPU process sandbox to be less strict.
+const char kReduceGpuSandbox[] = "reduce-gpu-sandbox";
+
// Register Pepper plugins (see pepper_plugin_registry.cc for its format).
const char kRegisterPepperPlugins[] = "register-pepper-plugins";
+
// Enables remote debug over HTTP on the specified port.
const char kRemoteDebuggingPort[] = "remote-debugging-port";
-#if defined(OS_ANDROID)
-// Enables remote debug over HTTP on the specified socket name.
-const char kRemoteDebuggingSocketName[] = "remote-debugging-socket-name";
-#endif
-
// Causes the renderer process to throw an assertion on launch.
const char kRendererAssertTest[] = "renderer-assert-test";
@@ -675,9 +707,6 @@ const char kRendererCmdPrefix[] = "renderer-cmd-prefix";
// Causes the process to run as renderer instead of as browser.
const char kRendererProcess[] = "renderer";
-// Enable the Vtune profiler support.
-const char kEnableVtune[] = "enable-vtune-support";
-
// Overrides the default/calculated limit to the number of renderer processes.
// Very high values for this setting can lead to high memory/resource usage
// or instability.
@@ -686,24 +715,10 @@ const char kRendererProcessLimit[] = "renderer-process-limit";
// Causes the renderer process to display a dialog on launch.
const char kRendererStartupDialog[] = "renderer-startup-dialog";
-// Enables accelerated compositing for overflow scroll. Promotes eligible
-// overflow:scroll elements to layers to enable accelerated scrolling for them.
-const char kEnableAcceleratedOverflowScroll[] =
- "enable-accelerated-overflow-scroll";
-
-// Disables accelerated compositing for overflow scroll.
-const char kDisableAcceleratedOverflowScroll[] =
- "disable-accelerated-overflow-scroll";
-
-// Enables accelerated compositing for scrollable frames for accelerated
-// scrolling for them. Requires kForceCompositingMode.
-const char kEnableAcceleratedScrollableFrames[] =
- "enable-accelerated-scrollable-frames";
-
-// Enables accelerated scrolling by the compositor for frames. Requires
-// kForceCompositingMode and kEnableAcceleratedScrollableFrames.
-const char kEnableCompositedScrollingForFrames[] =
- "enable-composited-scrolling-for-frames";
+// Enables or disables scroll end effect in response to vertical overscroll.
+// Set the value to '1' to enable the feature, and set to '0' to disable.
+// Defaults to disabled.
+const char kScrollEndEffect[] = "scroll-end-effect";
// Visibly render a border around paint rects in the web page to help debug
// and study painting behavior.
@@ -737,24 +752,35 @@ const char kSitePerProcess[] = "site-per-process";
// content. The switch is intended only for tests.
const char kSkipGpuDataLoading[] = "skip-gpu-data-loading";
+// Specifies the request key for the continuous speech recognition webservice.
+const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";
+
+// Specifies if the |StatsCollectionController| needs to be bound in the
+// renderer. This binding happens on per-frame basis and hence can potentially
+// be a performance bottleneck. One should only enable it when running a test
+// that needs to access the provided statistics.
+const char kStatsCollectionController[] =
+ "enable-stats-collection-bindings";
+
+// Upscale defaults to "good".
+const char kTabCaptureDownscaleQuality[] = "tab-capture-downscale-quality";
+
// Scaling quality for capturing tab. Should be one of "fast", "good" or "best".
// One flag for upscaling, one for downscaling.
// Upscale defaults to "best".
const char kTabCaptureUpscaleQuality[] = "tab-capture-upscale-quality";
-// Upscale defaults to "good".
-const char kTabCaptureDownscaleQuality[] = "tab-capture-downscale-quality";
// GestureTapDown events are deferred by this many miillseconds before
// sending them to the renderer.
const char kTapDownDeferralTimeMs[] = "tap-down-deferral-time";
-// Runs the security test for the renderer sandbox.
-const char kTestSandbox[] = "test-sandbox";
-
// Allows for forcing socket connections to http/https to use fixed ports.
const char kTestingFixedHttpPort[] = "testing-fixed-http-port";
const char kTestingFixedHttpsPort[] = "testing-fixed-https-port";
+// Runs the security test for the renderer sandbox.
+const char kTestSandbox[] = "test-sandbox";
+
// Causes TRACE_EVENT flags to be recorded from startup. Optionally, can
// specify the specific trace categories to include (e.g.
// --trace-startup=base,net) otherwise, all events are recorded. Setting this
@@ -764,6 +790,11 @@ const char kTestingFixedHttpsPort[] = "testing-fixed-https-port";
// supported in the base-only TraceLog component).
const char kTraceStartup[] = "trace-startup";
+// Sets the time in seconds until startup tracing ends. If omitted a default of
+// 5 seconds is used. Has no effect without --trace-startup, or if
+// --startup-trace-file=none was supplied.
+const char kTraceStartupDuration[] = "trace-startup-duration";
+
// If supplied, sets the file which startup tracing will be stored into, if
// omitted the default will be used "chrometrace.log" in the current directory.
// Has no effect unless --trace-startup is also supplied.
@@ -773,15 +804,25 @@ const char kTraceStartup[] = "trace-startup";
// all events since startup.
const char kTraceStartupFile[] = "trace-startup-file";
-// Sets the time in seconds until startup tracing ends. If omitted a default of
-// 5 seconds is used. Has no effect without --trace-startup, or if
-// --startup-trace-file=none was supplied.
-const char kTraceStartupDuration[] = "trace-startup-duration";
+
// Prioritizes the UI's command stream in the GPU process
extern const char kUIPrioritizeInGpuProcess[] =
"ui-prioritize-in-gpu-process";
+// Use fake device for MediaStream to replace actual camera and microphone.
+const char kUseFakeDeviceForMediaStream[] = "use-fake-device-for-media-stream";
+
+// Bypass the media stream infobar by selecting the default device for media
+// streams (e.g. WebRTC). Works with --use-fake-device-for-media-stream.
+const char kUseFakeUIForMediaStream[] = "use-fake-ui-for-media-stream";
+
+// Use hardware gpu, if available, for tests.
+const char kUseGpuInTests[] = "use-gpu-in-tests";
+
+// Set when Chromium should use a mobile user agent.
+const char kUseMobileUserAgent[] = "use-mobile-user-agent";
+
// A string used to override the default user agent with a custom one.
const char kUserAgent[] = "user-agent";
@@ -818,25 +859,50 @@ const char kZygoteCmdPrefix[] = "zygote-cmd-prefix";
// Causes the process to run as a renderer zygote.
const char kZygoteProcess[] = "zygote";
-// Enables moving cursor by word in visual order.
-const char kEnableVisualWordMovement[] = "enable-visual-word-movement";
+#if defined(ENABLE_WEBRTC)
+// Disable WebRTC device enumeration.
+const char kDisableDeviceEnumeration[] = "disable-device-enumeration";
-// Set when Chromium should use a mobile user agent.
-const char kUseMobileUserAgent[] = "use-mobile-user-agent";
+// Enable WebRTC DataChannels SCTP wire protocol support.
+const char kEnableSCTPDataChannels[] = "enable-sctp-data-channels";
+
+// Enables WebRTC AEC recordings.
+const char kEnableWebRtcAecRecordings[] = "enable-webrtc-aec-recordings";
+
+// Enables HW decode acceleration for WebRTC.
+const char kEnableWebRtcHWDecoding[] = "enable-webrtc-hw-decoding";
+
+#endif
#if defined(OS_ANDROID)
-// Disable history logging for media elements.
-const char kDisableMediaHistoryLogging[] = "disable-media-history";
+// Disables device motion events.
+const char kDisableDeviceMotion[] = "disable-device-motion";
// Disable user gesture requirement for media playback.
const char kDisableGestureRequirementForMediaPlayback[] =
"disable-gesture-requirement-for-media-playback";
-// The telephony region (ISO country code) to use in phone number detection.
-const char kNetworkCountryIso[] = "network-country-iso";
+// Disable history logging for media elements.
+const char kDisableMediaHistoryLogging[] = "disable-media-history";
// Disable overscroll edge effects like those found in Android views.
const char kDisableOverscrollEdgeEffect[] = "disable-overscroll-edge-effect";
+
+// WebRTC is enabled by default on Android.
+const char kDisableWebRTC[] = "disable-webrtc";
+
+// Enable the recognition part of the Web Speech API.
+const char kEnableSpeechRecognition[] = "enable-speech-recognition";
+
+// Don't display any scrollbars. This is useful for Android WebView where
+// the system manages the scrollbars instead.
+const char kHideScrollbars[] = "hide-scrollbars";
+
+// The telephony region (ISO country code) to use in phone number detection.
+const char kNetworkCountryIso[] = "network-country-iso";
+
+// Enables remote debug over HTTP on the specified socket name.
+const char kRemoteDebuggingSocketName[] = "remote-debugging-socket-name";
#endif
#if defined(OS_CHROMEOS)
@@ -844,11 +910,6 @@ const char kDisableOverscrollEdgeEffect[] = "disable-overscroll-edge-effect";
const char kDisablePanelFitting[] = "disable-panel-fitting";
#endif
-#if defined(OS_POSIX)
-// Causes the child processes to cleanly exit via calling exit().
-const char kChildCleanExit[] = "child-clean-exit";
-#endif
-
#if defined(OS_MACOSX) && !defined(OS_IOS)
const char kDisableCarbonInterposing[] = "disable-carbon-interposing";
@@ -856,58 +917,16 @@ const char kDisableCarbonInterposing[] = "disable-carbon-interposing";
const char kUseCoreAnimation[] = "use-core-animation";
#endif
-// Disables the use of a 3D software rasterizer.
-const char kDisableSoftwareRasterizer[] = "disable-software-rasterizer";
+#if defined(OS_POSIX)
+// Causes the child processes to cleanly exit via calling exit().
+const char kChildCleanExit[] = "child-clean-exit";
+#endif
#if defined(USE_AURA)
// Forces usage of the test compositor. Needed to run ui tests on bots.
extern const char kTestCompositor[] = "test-compositor";
#endif
-// Sets the tile size used by composited layers.
-const char kDefaultTileWidth[] = "default-tile-width";
-const char kDefaultTileHeight[] = "default-tile-height";
-
-// Sets the width and height above which a composited layer will get tiled.
-const char kMaxUntiledLayerWidth[] = "max-untiled-layer-width";
-const char kMaxUntiledLayerHeight[] = "max-untiled-layer-height";
-
-const char kEnableFixedPositionCreatesStackingContext[]
- = "enable-fixed-position-creates-stacking-context";
-const char kDisableFixedPositionCreatesStackingContext[]
- = "disable-fixed-position-creates-stacking-context";
-
-// Defer image decoding in WebKit until painting.
-const char kEnableDeferredImageDecoding[] = "enable-deferred-image-decoding";
-
-// Use a begin frame signal from browser to renderer to schedule rendering.
-const char kEnableBeginFrameScheduling[] = "enable-begin-frame-scheduling";
-
-// Synchronize delivery and response of input events to and from the renderer.
-const char kEnableBrowserInputController[] = "enable-browser-input-controller";
-
-// Enables or disables history navigation in response to horizontal overscroll.
-// Set the value to '1' to enable the feature, and set to '0' to disable.
-// Defaults to enabled.
-const char kOverscrollHistoryNavigation[] =
- "overscroll-history-navigation";
-
-// Enables or disables scroll end effect in response to vertical overscroll.
-// Set the value to '1' to enable the feature, and set to '0' to disable.
-// Defaults to disabled.
-const char kScrollEndEffect[] = "scroll-end-effect";
-
-// Forward overscroll event data from the renderer to the browser.
-const char kEnableOverscrollNotifications[] = "enable-overscroll-notifications";
-
-// Enables WebGL extensions not yet approved by the community.
-const char kEnableWebGLDraftExtensions[] = "enable-webgl-draft-extensions";
-
-// Enables/disables accelerated compositing for backgrounds of root layers with
-// background-attachment: fixed. Requires kForceCompositingMode.
-const char kDisableAcceleratedFixedRootBackground[] =
- "disable-accelerated-fixed-root-background";
-const char kEnableAcceleratedFixedRootBackground[] =
- "enable-accelerated-fixed-root-background";
+// Don't dump stuff here, follow the same order as the header.
} // namespace switches
diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h
index c261841505595..a4852d5496ab6 100644
--- a/content/public/common/content_switches.h
+++ b/content/public/common/content_switches.h
@@ -12,149 +12,154 @@
namespace switches {
+// All switches in alphabetical order. The switches should be documented
+// alongside the definition of their values in the .cc file.
CONTENT_EXPORT extern const char kAllowFileAccessFromFiles[];
+CONTENT_EXPORT extern const char kAllowNoSandboxJob[];
extern const char kAllowSandboxDebugging[];
extern const char kAllowWebUICompositing[];
-extern const char kAuditHandles[];
extern const char kAuditAllHandles[];
+extern const char kAuditHandles[];
+CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];
+CONTENT_EXPORT extern const char kBlacklistWebGL[];
CONTENT_EXPORT extern const char kBrowserAssertTest[];
CONTENT_EXPORT extern const char kBrowserCrashTest[];
CONTENT_EXPORT extern const char kBrowserSubprocessPath[];
+extern const char kDebugPluginLoading[];
+extern const char kDefaultTileWidth[];
+extern const char kDefaultTileHeight[];
CONTENT_EXPORT extern const char kDisable2dCanvasAntialiasing[];
-CONTENT_EXPORT extern const char kEnableExperimentalCanvasFeatures[];
CONTENT_EXPORT extern const char kDisable3DAPIs[];
CONTENT_EXPORT extern const char kDisableAccelerated2dCanvas[];
CONTENT_EXPORT extern const char kDisableAcceleratedCompositing[];
+CONTENT_EXPORT extern const char kDisableAcceleratedFixedRootBackground[];
CONTENT_EXPORT extern const char kDisableAcceleratedLayers[];
+extern const char kDisableAcceleratedOverflowScroll[];
CONTENT_EXPORT extern const char kDisableAcceleratedPlugins[];
CONTENT_EXPORT extern const char kDisableAcceleratedVideo[];
+CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
CONTENT_EXPORT extern const char kDisableAltWinstation[];
CONTENT_EXPORT extern const char kDisableApplicationCache[];
CONTENT_EXPORT extern const char kDisableAudio[];
extern const char kDisableBackingStoreLimit[];
+CONTENT_EXPORT extern const char kDisableBrowserPluginCompositing[];
+CONTENT_EXPORT extern const char kDisableCompositingForFixedPosition[];
+CONTENT_EXPORT extern const char kDisableCompositingForTransition[];
CONTENT_EXPORT extern const char kDisableDatabases[];
+CONTENT_EXPORT extern const char kDisableDelegatedRenderer[];
extern const char kDisableDesktopNotifications[];
CONTENT_EXPORT extern const char kDisableDeviceOrientation[];
CONTENT_EXPORT extern const char kDisableExperimentalWebGL[];
-CONTENT_EXPORT extern const char kBlacklistAcceleratedCompositing[];
-CONTENT_EXPORT extern const char kBlacklistWebGL[];
extern const char kDisableFileSystem[];
+CONTENT_EXPORT extern const char kDisableFixedPositionCreatesStackingContext[];
CONTENT_EXPORT extern const char kDisableFlash3d[];
CONTENT_EXPORT extern const char kDisableFlashStage3d[];
CONTENT_EXPORT extern const char kDisableForceCompositingMode[];
+CONTENT_EXPORT extern const char kDisableFullScreen[];
extern const char kDisableGeolocation[];
-CONTENT_EXPORT extern const char kUseGpuInTests[];
-extern const char kDisableGpu[];
+CONTENT_EXPORT extern const char kDisableGestureTapHighlight[];
CONTENT_EXPORT extern const char kDisableGLMultisampling[];
+extern const char kDisableGpu[];
+CONTENT_EXPORT extern const char kDisableGpuCompositing[];
CONTENT_EXPORT extern const char kDisableGpuProcessPrelaunch[];
extern const char kDisableGpuSandbox[];
-extern const char kReduceGpuSandbox[];
-CONTENT_EXPORT extern const char kDisableGpuCompositing[];
extern const char kDisableGpuWatchdog[];
CONTENT_EXPORT extern const char kDisableHangMonitor[];
-CONTENT_EXPORT extern const char kDisableHTMLNotifications[];
extern const char kDisableHistogramCustomizer[];
+CONTENT_EXPORT extern const char kDisableHTMLNotifications[];
extern const char kDisableImageTransportSurface[];
CONTENT_EXPORT extern const char kDisableJava[];
CONTENT_EXPORT extern const char kDisableJavaScript[];
+extern const char kDisableLegacyEncryptedMedia[];
CONTENT_EXPORT extern const char kDisableLocalStorage[];
CONTENT_EXPORT extern const char kDisableLogging[];
-CONTENT_EXPORT extern const char kLogNetLog[];
-CONTENT_EXPORT extern const char kDisableSmoothScrolling[];
+extern const char kDisablePepper3d[];
+extern const char kDisablePinch[];
CONTENT_EXPORT extern const char kDisablePlugins[];
+CONTENT_EXPORT extern const char kDisablePluginsDiscovery[];
extern const char kDisableRemoteFonts[];
extern const char kDisableRendererAccessibility[];
-extern const char kDisableSSLFalseStart[];
extern const char kDisableSeccompFilterSandbox[];
extern const char kDisableSessionStorage[];
extern const char kDisableSetuidSandbox[];
extern const char kDisableSharedWorkers[];
extern const char kDisableSiteSpecificQuirks[];
+CONTENT_EXPORT extern const char kDisableSmoothScrolling[];
+CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[];
CONTENT_EXPORT extern const char kDisableSpeechInput[];
-extern const char kSpeechRecognitionWebserviceKey[];
-CONTENT_EXPORT extern const char kEnableSpeechSynthesis[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kDisableWebRTC[];
-CONTENT_EXPORT extern const char kEnableSpeechRecognition[];
-#endif
+extern const char kDisableSSLFalseStart[];
+CONTENT_EXPORT extern const char kDisableThreadedCompositing[];
+CONTENT_EXPORT extern const char kDisableThreadedHTMLParser[];
CONTENT_EXPORT extern const char kDisableWebAudio[];
-#if defined(ENABLE_WEBRTC)
-CONTENT_EXPORT extern const char kDisableDeviceEnumeration[];
-CONTENT_EXPORT extern const char kEnableSCTPDataChannels[];
-extern const char kEnableWebRtcAecRecordings[];
-extern const char kEnableWebRtcHWDecoding[];
-#endif
-extern const char kEnableWebRtcTcpServerSocket[];
-extern const char kEnableWebAnimationsCSS[];
-extern const char kEnableWebAnimationsSVG[];
-extern const char kEnableWebMIDI[];
+extern const char kDisableWebKitMediaSource[];
extern const char kDisableWebSecurity[];
-extern const char kEnableExperimentalWebSocket[];
-extern const char kEnableHTMLImports[];
extern const char kDisableXSSAuditor[];
CONTENT_EXPORT extern const char kDomAutomationController[];
-CONTENT_EXPORT extern const char kStatsCollectionController[];
CONTENT_EXPORT extern const char kEnableAcceleratedFilters[];
+CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
+extern const char kEnableAcceleratedOverflowScroll[];
+extern const char kEnableAcceleratedScrollableFrames[];
extern const char kEnableAccessibilityLogging[];
extern const char kEnableAudibleNotifications[];
-CONTENT_EXPORT extern const char kDisableBrowserPluginCompositing[];
+CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[];
+CONTENT_EXPORT extern const char kEnableBrowserInputController[];
CONTENT_EXPORT extern const char kEnableBrowserPluginForAllViewTypes[];
CONTENT_EXPORT extern const char kEnableBrowserPluginDragDrop[];
+extern const char kEnableCompositedScrollingForFrames[];
CONTENT_EXPORT extern const char kEnableCompositingForFixedPosition[];
-CONTENT_EXPORT extern const char kEnableHighDpiCompositingForFixedPosition[];
-CONTENT_EXPORT extern const char kDisableCompositingForFixedPosition[];
CONTENT_EXPORT extern const char kEnableCompositingForTransition[];
-CONTENT_EXPORT extern const char kDisableCompositingForTransition[];
CONTENT_EXPORT extern const char kEnableCssShaders[];
-CONTENT_EXPORT extern const char kDisableDelegatedRenderer[];
+CONTENT_EXPORT extern const char kEnableDeferredImageDecoding[];
CONTENT_EXPORT extern const char kEnableDelegatedRenderer[];
CONTENT_EXPORT extern const char kEnableDeviceMotion[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kDisableDeviceMotion[];
-#endif
CONTENT_EXPORT extern const char kEnableDownloadResumption[];
+extern const char kEnableEncryptedMedia[];
+CONTENT_EXPORT extern const char kEnableExperimentalCanvasFeatures[];
CONTENT_EXPORT extern const char kEnableExperimentalWebPlatformFeatures[];
-CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
-CONTENT_EXPORT extern const char kDisableThreadedHTMLParser[];
+extern const char kEnableExperimentalWebSocket[];
CONTENT_EXPORT extern const char kEnableFixedLayout[];
-CONTENT_EXPORT extern const char kDisableFullScreen[];
-CONTENT_EXPORT extern const char kEnableTextServicesFramework[];
+CONTENT_EXPORT extern const char kEnableFixedPositionCreatesStackingContext[];
CONTENT_EXPORT extern const char kEnableGestureTapHighlight[];
-CONTENT_EXPORT extern const char kDisableGestureTapHighlight[];
extern const char kEnableGpuBenchmarking[];
extern const char kEnableGpuClientTracing[];
+CONTENT_EXPORT extern const char kEnableHighDpiCompositingForFixedPosition[];
+extern const char kEnableHTMLImports[];
CONTENT_EXPORT extern const char kEnableInbandTextTracks[];
-extern const char kEnableMemoryBenchmarking[];
-extern const char kEnableSkiaBenchmarking[];
CONTENT_EXPORT extern const char kEnableLogging[];
-extern const char kDisableWebKitMediaSource[];
-extern const char kEnableEncryptedMedia[];
-extern const char kDisableLegacyEncryptedMedia[];
-CONTENT_EXPORT extern const char kUseFakeDeviceForMediaStream[];
-CONTENT_EXPORT extern const char kUseFakeUIForMediaStream[];
+extern const char kEnableMemoryBenchmarking[];
extern const char kEnableMonitorProfile[];
extern const char kEnableNewMediaInternals[];
-extern const char kEnableUserMediaScreenCapturing[];
-extern const char kEnablePinch[];
CONTENT_EXPORT extern const char kEnableOfflineCacheAccess[];
-extern const char kDisablePinch[];
+CONTENT_EXPORT extern const char kEnableOverscrollNotifications[];
+extern const char kEnablePinch[];
extern const char kEnablePreparsedJsCaching[];
CONTENT_EXPORT extern const char kEnablePrivilegedWebGLExtensions[];
extern const char kEnablePruneGpuCommandBuffers[];
-extern const char kEnableSSLCachedInfo[];
+CONTENT_EXPORT extern const char kEnableRegionBasedColumns[];
extern const char kEnableSandboxLogging[];
-extern const char kEnableSpatialNavigation[];
-CONTENT_EXPORT extern const char kEnableSoftwareCompositing[];
+extern const char kEnableSkiaBenchmarking[];
CONTENT_EXPORT extern const char kEnableSmoothScrolling[];
+CONTENT_EXPORT extern const char kEnableSoftwareCompositing[];
+extern const char kEnableSpatialNavigation[];
+CONTENT_EXPORT extern const char kEnableSpeechSynthesis[];
+extern const char kEnableSSLCachedInfo[];
CONTENT_EXPORT extern const char kEnableStatsTable[];
extern const char kEnableStrictSiteIsolation[];
-CONTENT_EXPORT extern const char kEnableThreadedCompositing[];
-CONTENT_EXPORT extern const char kDisableThreadedCompositing[];
-extern const char kEnableVirtualGLContexts[];
CONTENT_EXPORT extern const char kEnableTcpFastOpen[];
-CONTENT_EXPORT extern const char kDisableAcceleratedVideoDecode[];
+CONTENT_EXPORT extern const char kEnableTextServicesFramework[];
+CONTENT_EXPORT extern const char kEnableThreadedCompositing[];
+extern const char kEnableUserMediaScreenCapturing[];
extern const char kEnableViewport[];
+extern const char kEnableVirtualGLContexts[];
+extern const char kEnableVisualWordMovement[];
+CONTENT_EXPORT extern const char kEnableVtune[];
+extern const char kEnableWebAnimationsCSS[];
+extern const char kEnableWebAnimationsSVG[];
+CONTENT_EXPORT extern const char kEnableWebGLDraftExtensions[];
+extern const char kEnableWebMIDI[];
+extern const char kEnableWebRtcTcpServerSocket[];
CONTENT_EXPORT extern const char kExperimentalLocationFeatures[];
+CONTENT_EXPORT extern const char kExtraPluginDir[];
CONTENT_EXPORT extern const char kForceCompositingMode[];
extern const char kForceFieldTrials[];
CONTENT_EXPORT extern const char kForceRendererAccessibility[];
@@ -166,30 +171,29 @@ CONTENT_EXPORT extern const char kGpuProcess[];
extern const char kGpuSandboxAllowSysVShm[];
extern const char kGpuStartupDialog[];
extern const char kGpuVendorID[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kHideScrollbars[];
-#endif
CONTENT_EXPORT extern const char kHostResolverRules[];
CONTENT_EXPORT extern const char kIgnoreCertificateErrors[];
CONTENT_EXPORT extern const char kIgnoreGpuBlacklist[];
extern const char kInProcessGPU[];
extern const char kInProcessPlugins[];
CONTENT_EXPORT extern const char kJavaScriptFlags[];
-CONTENT_EXPORT extern const char kExtraPluginDir[];
extern const char kLoadPlugin[];
-CONTENT_EXPORT extern const char kDisablePluginsDiscovery[];
CONTENT_EXPORT extern const char kLoggingLevel[];
+CONTENT_EXPORT extern const char kLogNetLog[];
extern const char kLogPluginMessages[];
+extern const char kMaxUntiledLayerHeight[];
+extern const char kMaxUntiledLayerWidth[];
extern const char kMemoryMetrics[];
CONTENT_EXPORT extern const char kMuteAudio[];
CONTENT_EXPORT extern const char kNoReferrers[];
CONTENT_EXPORT extern const char kNoSandbox[];
-CONTENT_EXPORT extern const char kAllowNoSandboxJob[];
+CONTENT_EXPORT extern const char kOverscrollHistoryNavigation[];
extern const char kPluginLauncher[];
CONTENT_EXPORT extern const char kPluginPath[];
CONTENT_EXPORT extern const char kPluginProcess[];
extern const char kPluginStartupDialog[];
CONTENT_EXPORT extern const char kPpapiBrokerProcess[];
+extern const char kPpapiFlashArgs[];
CONTENT_EXPORT extern const char kPpapiInProcess[];
extern const char kPpapiPluginLauncher[];
CONTENT_EXPORT extern const char kPpapiPluginProcess[];
@@ -197,36 +201,36 @@ extern const char kPpapiStartupDialog[];
CONTENT_EXPORT extern const char kProcessPerSite[];
CONTENT_EXPORT extern const char kProcessPerTab[];
CONTENT_EXPORT extern const char kProcessType[];
+extern const char kReduceGpuSandbox[];
CONTENT_EXPORT extern const char kRegisterPepperPlugins[];
CONTENT_EXPORT extern const char kRemoteDebuggingPort[];
-#if defined(OS_ANDROID)
-CONTENT_EXPORT extern const char kRemoteDebuggingSocketName[];
-#endif
CONTENT_EXPORT extern const char kRendererAssertTest[];
extern const char kRendererCmdPrefix[];
CONTENT_EXPORT extern const char kRendererProcess[];
-CONTENT_EXPORT extern const char kEnableVtune[];
extern const char kRendererProcessLimit[];
extern const char kRendererStartupDialog[];
-extern const char kEnableAcceleratedOverflowScroll[];
-extern const char kDisableAcceleratedOverflowScroll[];
-extern const char kEnableAcceleratedScrollableFrames[];
-extern const char kEnableCompositedScrollingForFrames[];
+CONTENT_EXPORT extern const char kScrollEndEffect[];
extern const char kShowPaintRects[];
CONTENT_EXPORT extern const char kSimulateTouchScreenWithMouse[];
CONTENT_EXPORT extern const char kSingleProcess[];
CONTENT_EXPORT extern const char kSitePerProcess[];
CONTENT_EXPORT extern const char kSkipGpuDataLoading[];
-extern const char kTabCaptureUpscaleQuality[];
+extern const char kSpeechRecognitionWebserviceKey[];
+CONTENT_EXPORT extern const char kStatsCollectionController[];
extern const char kTabCaptureDownscaleQuality[];
+extern const char kTabCaptureUpscaleQuality[];
extern const char kTapDownDeferralTimeMs[];
-CONTENT_EXPORT extern const char kTestSandbox[];
CONTENT_EXPORT extern const char kTestingFixedHttpPort[];
CONTENT_EXPORT extern const char kTestingFixedHttpsPort[];
+CONTENT_EXPORT extern const char kTestSandbox[];
extern const char kTraceStartup[];
-extern const char kTraceStartupFile[];
extern const char kTraceStartupDuration[];
+extern const char kTraceStartupFile[];
CONTENT_EXPORT extern const char kUIPrioritizeInGpuProcess[];
+CONTENT_EXPORT extern const char kUseFakeDeviceForMediaStream[];
+CONTENT_EXPORT extern const char kUseFakeUIForMediaStream[];
+CONTENT_EXPORT extern const char kUseGpuInTests[];
+CONTENT_EXPORT extern const char kUseMobileUserAgent[];
CONTENT_EXPORT extern const char kUserAgent[];
extern const char kUtilityCmdPrefix[];
CONTENT_EXPORT extern const char kUtilityProcess[];
@@ -237,51 +241,45 @@ extern const char kWebCoreLogChannels[];
CONTENT_EXPORT extern const char kWorkerProcess[];
CONTENT_EXPORT extern const char kZygoteCmdPrefix[];
CONTENT_EXPORT extern const char kZygoteProcess[];
-CONTENT_EXPORT extern const char kDisableSoftwareRasterizer[];
-extern const char kDefaultTileWidth[];
-extern const char kDefaultTileHeight[];
-extern const char kMaxUntiledLayerWidth[];
-extern const char kMaxUntiledLayerHeight[];
-CONTENT_EXPORT extern const char kEnableFixedPositionCreatesStackingContext[];
-CONTENT_EXPORT extern const char kDisableFixedPositionCreatesStackingContext[];
-CONTENT_EXPORT extern const char kEnableDeferredImageDecoding[];
-CONTENT_EXPORT extern const char kEnableBeginFrameScheduling[];
-CONTENT_EXPORT extern const char kEnableBrowserInputController[];
-extern const char kEnableVisualWordMovement[];
-CONTENT_EXPORT extern const char kUseMobileUserAgent[];
+#if defined(ENABLE_WEBRTC)
+CONTENT_EXPORT extern const char kDisableDeviceEnumeration[];
+CONTENT_EXPORT extern const char kEnableSCTPDataChannels[];
+extern const char kEnableWebRtcAecRecordings[];
+extern const char kEnableWebRtcHWDecoding[];
+#endif
#if defined(OS_ANDROID)
-extern const char kDisableMediaHistoryLogging[];
+CONTENT_EXPORT extern const char kDisableDeviceMotion[];
CONTENT_EXPORT extern const char kDisableGestureRequirementForMediaPlayback[];
-extern const char kNetworkCountryIso[];
+extern const char kDisableMediaHistoryLogging[];
CONTENT_EXPORT extern const char kDisableOverscrollEdgeEffect[];
+CONTENT_EXPORT extern const char kDisableWebRTC[];
+CONTENT_EXPORT extern const char kEnableSpeechRecognition[];
+CONTENT_EXPORT extern const char kHideScrollbars[];
+extern const char kNetworkCountryIso[];
+CONTENT_EXPORT extern const char kRemoteDebuggingSocketName[];
#endif
#if defined(OS_CHROMEOS)
CONTENT_EXPORT extern const char kDisablePanelFitting[];
#endif
-#if defined(OS_POSIX)
-extern const char kChildCleanExit[];
-#endif
-
#if defined(OS_MACOSX) && !defined(OS_IOS)
extern const char kDisableCarbonInterposing[];
extern const char kUseCoreAnimation[];
#endif
+#if defined(OS_POSIX)
+extern const char kChildCleanExit[];
+#endif
+
#if defined(USE_AURA)
CONTENT_EXPORT extern const char kTestCompositor[];
#endif
-CONTENT_EXPORT extern const char kOverscrollHistoryNavigation[];
-CONTENT_EXPORT extern const char kScrollEndEffect[];
-CONTENT_EXPORT extern const char kEnableOverscrollNotifications[];
-CONTENT_EXPORT extern const char kEnableWebGLDraftExtensions[];
-
-CONTENT_EXPORT extern const char kDisableAcceleratedFixedRootBackground[];
-CONTENT_EXPORT extern const char kEnableAcceleratedFixedRootBackground[];
+// DON'T ADD RANDOM STUFF HERE. Put it in the main section above in
+// alphabetical order, or in one of the ifdefs (also in order in each section).
} // namespace switches
diff --git a/content/renderer/pepper/host_globals.cc b/content/renderer/pepper/host_globals.cc
index dac943bac489f..0c66e5f3724a9 100644
--- a/content/renderer/pepper/host_globals.cc
+++ b/content/renderer/pepper/host_globals.cc
@@ -11,6 +11,7 @@
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task_runner.h"
+#include "content/public/common/content_switches.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
#include "content/renderer/pepper/plugin_module.h"
#include "content/renderer/render_thread_impl.h"
@@ -22,7 +23,6 @@
#include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
-#include "webkit/plugins/plugin_switches.h"
using ppapi::CheckIdType;
using ppapi::MakeTypedId;
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc
index 6ccad4d834c50..2ddf10a1113b7 100644
--- a/content/renderer/pepper/plugin_module.cc
+++ b/content/renderer/pepper/plugin_module.cc
@@ -138,7 +138,6 @@
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_graphics_2d_api.h"
#include "ppapi/thunk/thunk.h"
-#include "webkit/plugins/plugin_switches.h"
using ppapi::InputEventData;
using ppapi::PpapiGlobals;
diff --git a/content/renderer/pepper/ppb_gpu_blacklist_private_impl.cc b/content/renderer/pepper/ppb_gpu_blacklist_private_impl.cc
index 7649caecdcbd1..8db33bd4247d6 100644
--- a/content/renderer/pepper/ppb_gpu_blacklist_private_impl.cc
+++ b/content/renderer/pepper/ppb_gpu_blacklist_private_impl.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/logging.h"
-#include "webkit/plugins/plugin_switches.h"
+#include "content/public/common/content_switches.h"
// todo(nfullagar): Remove this private interface when the SRPC proxy is
// permanently disabled.
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc
index 658778130765b..b48d68ab03079 100644
--- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
+++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -8,6 +8,7 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
+#include "content/public/common/content_switches.h"
#include "content/renderer/pepper/host_globals.h"
#include "content/renderer/pepper/pepper_platform_context_3d.h"
#include "content/renderer/pepper/pepper_plugin_instance_impl.h"
@@ -23,7 +24,6 @@
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebPluginContainer.h"
#include "webkit/common/webpreferences.h"
-#include "webkit/plugins/plugin_switches.h"
using ppapi::thunk::EnterResourceNoLock;
using ppapi::thunk::PPB_Graphics3D_API;
@@ -72,8 +72,7 @@ PPB_Graphics3D_Impl::~PPB_Graphics3D_Impl() {
PP_Bool PPB_Graphics3D_Impl::IsGpuBlacklisted() {
CommandLine* command_line = CommandLine::ForCurrentProcess();
if (command_line)
- return PP_FromBool(
- command_line->HasSwitch(switches::kDisablePepper3d));
+ return PP_FromBool(command_line->HasSwitch(switches::kDisablePepper3d));
return PP_TRUE;
}
diff --git a/webkit/plugins/webkit_plugins.gyp b/webkit/plugins/webkit_plugins.gyp
index 65e274c4d18c7..36cee908e4c5b 100644
--- a/webkit/plugins/webkit_plugins.gyp
+++ b/webkit/plugins/webkit_plugins.gyp
@@ -26,8 +26,6 @@
'sources': [
'../plugins/plugin_constants.cc',
'../plugins/plugin_constants.h',
- '../plugins/plugin_switches.cc',
- '../plugins/plugin_switches.h',
],
'conditions': [
['toolkit_uses_gtk == 1', {