diff options
| -rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/worker_host/worker_process_host.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 6 | ||||
| -rw-r--r-- | chrome/renderer/render_thread.cc | 2 | ||||
| -rw-r--r-- | chrome/worker/worker_thread.cc | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 4543eb4..f8ef0b1 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -614,7 +614,7 @@ void BrowserRenderProcessHost::PropagateBrowserCommandLineToRenderer( switches::kEnableResourceContentSettings, switches::kPrelaunchGpuProcess, switches::kEnableAcceleratedDecoding, - switches::kEnableFileSystem + switches::kDisableFileSystem }; renderer_cmd->CopySwitchesFrom(browser_cmd, kSwitchNames, arraysize(kSwitchNames)); diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc index 7fe1c53..c8df23d 100644 --- a/chrome/browser/worker_host/worker_process_host.cc +++ b/chrome/browser/worker_host/worker_process_host.cc @@ -142,7 +142,7 @@ bool WorkerProcessHost::Init() { #if defined(OS_WIN) switches::kDisableDesktopNotifications, #endif - switches::kEnableFileSystem, + switches::kDisableFileSystem, }; cmd_line->CopySwitchesFrom(*CommandLine::ForCurrentProcess(), kSwitchNames, arraysize(kSwitchNames)); diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index dc970bd..d38d1b0 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -195,6 +195,9 @@ const char kDisableExtensions[] = "disable-extensions"; const char kDisableExtensionsFileAccessCheck[] = "disable-extensions-file-access-check"; +// Disable FileSystem API. +const char kDisableFileSystem[] = "disable-file-system"; + // Suppresses support for the Geolocation javascript API. const char kDisableGeolocation[] = "disable-geolocation"; @@ -430,9 +433,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 FileSystem API. -const char kEnableFileSystem[] = "enable-file-system"; - // Enable IPv6 support, even if probes suggest that it may not be fully // supported. Some probes may require internet connections, and this flag will // allow support independent of application testing. diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 19d91cc..e5c6477 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -65,10 +65,11 @@ extern const char kDisableDesktopNotifications[]; extern const char kDisableDevTools[]; extern const char kDisableDeviceOrientation[]; extern const char kDisableExperimentalWebGL[]; -extern const char kDisableExtensions[]; extern const char kDisableExtensionsFileAccessCheck[]; -extern const char kDisableGeolocation[]; +extern const char kDisableExtensions[]; +extern const char kDisableFileSystem[]; extern const char kDisableGLSLTranslator[]; +extern const char kDisableGeolocation[]; extern const char kDisableHangMonitor[]; extern const char kDisableHistoryQuickProvider[]; extern const char kDisableHistoryURLProvider[]; @@ -133,7 +134,6 @@ extern const char kEnableExperimentalExtensionApis[]; extern const char kEnableExtensionTimelineApi[]; extern const char kEnableFastback[]; extern const char kEnableFileCookies[]; -extern const char kEnableFileSystem[]; extern const char kEnableGPUPlugin[]; extern const char kEnableGPURendering[]; extern const char kEnableIPv6[]; diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc index f29bb0a..9a71b31 100644 --- a/chrome/renderer/render_thread.cc +++ b/chrome/renderer/render_thread.cc @@ -934,7 +934,7 @@ void RenderThread::EnsureWebKitInitialized() { WebRuntimeFeatures::enableSpeechInput(IsSpeechInputEnabled(command_line)); WebRuntimeFeatures::enableFileSystem( - command_line.HasSwitch(switches::kEnableFileSystem)); + !command_line.HasSwitch(switches::kDisableFileSystem)); } void RenderThread::IdleHandler() { diff --git a/chrome/worker/worker_thread.cc b/chrome/worker/worker_thread.cc index 4a8ec52..d5373cd 100644 --- a/chrome/worker/worker_thread.cc +++ b/chrome/worker/worker_thread.cc @@ -57,7 +57,7 @@ WorkerThread::WorkerThread() { !command_line.HasSwitch(switches::kDisableWebSockets)); WebRuntimeFeatures::enableFileSystem( - command_line.HasSwitch(switches::kEnableFileSystem)); + !command_line.HasSwitch(switches::kDisableFileSystem)); } WorkerThread::~WorkerThread() { |