diff options
Diffstat (limited to 'chromium/chrome/common/chrome_switches.cc')
| -rw-r--r-- | chromium/chrome/common/chrome_switches.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chromium/chrome/common/chrome_switches.cc b/chromium/chrome/common/chrome_switches.cc index 1ef2f31635d..294c2c6fa41 100644 --- a/chromium/chrome/common/chrome_switches.cc +++ b/chromium/chrome/common/chrome_switches.cc @@ -137,8 +137,10 @@ const char kCrashOnHangThreads[] = "crash-on-hang-threads"; const char kCreateBrowserOnStartupForTests[] = "create-browser-on-startup-for-tests"; -// Specifies the HTTP endpoint which will be used to serve +// Specifies the http:// endpoint which will be used to serve // devtools://devtools/custom/<path> +// Or a file:// URL to specify a custom file path to load from for +// devtools://devtools/bundled/<path> const char kCustomDevtoolsFrontend[] = "custom-devtools-frontend"; // Enables a frame context menu item that toggles the frame in and out of glass @@ -249,9 +251,6 @@ const char kDiskCacheSize[] = "disk-cache-size"; const char kDnsLogDetails[] = "dns-log-details"; -// Enables new UI for net-error page. -const char kNewNetErrorPageUI[] = "new-net-error-page-ui"; - // Requests that a running browser process dump its collected histograms to a // given file. The file is overwritten if it exists. const char kDumpBrowserHistograms[] = "dump-browser-histograms"; @@ -860,12 +859,11 @@ const char kEnableNewAppMenuIcon[] = "enable-new-app-menu-icon"; const char kGuest[] = "guest"; #endif -#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && \ - !defined(GOOGLE_CHROME_BUILD) +#if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) // Enables Machine level user cloud policy on Chromium build. This policy is // always enabled on the branded builds. -const char kEnableMachineLevelUserCloudPolicy[] = - "enable-machine-level-user-cloud-policy"; +const char kEnableChromeBrowserCloudManagement[] = + "enable-chrome-browser-cloud-management"; #endif #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) |