diff options
| -rw-r--r-- | chrome/common/chrome_plugin_lib.cc | 5 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 10 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 |
3 files changed, 8 insertions, 9 deletions
diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc index ceb4e54..e9d0224 100644 --- a/chrome/common/chrome_plugin_lib.cc +++ b/chrome/common/chrome_plugin_lib.cc @@ -117,9 +117,8 @@ void ChromePluginLib::RegisterPluginsWithNPAPI() { NPAPI::PluginList::Singleton()->AddExtraPluginPath(path); // Register the internal Flash, if available. - // TODO(viettrungluu): The command-line switch is temporary. - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableInternalFlash) && + if (!CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableInternalFlash) && PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) NPAPI::PluginList::Singleton()->AddExtraPluginPath(path); } diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index e057147..260df1b 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -114,11 +114,14 @@ const char kDisableDevTools[] = "disable-dev-tools"; const char kDisableExtensions[] = "disable-extensions"; // Suppresses support for the Geolocation javascript API. -const char kDisableGeolocation[] = "disable-geolocation"; +const char kDisableGeolocation[] = "disable-geolocation"; // Suppresses hang monitor dialogs in renderer processes. const char kDisableHangMonitor[] = "disable-hang-monitor"; +// Disable the internal Flash Player. +const char kDisableInternalFlash[] = "disable-internal-flash"; + // Don't resolve hostnames to IPv6 addresses. This can be used when debugging // issues relating to IPv6, but shouldn't otherwise be needed. Be sure to // file bugs if something isn't working properly in the presence of IPv6. @@ -132,7 +135,7 @@ const char kDisableJavaScript[] = "disable-javascript"; const char kDisableJava[] = "disable-java"; // Disable LocalStorage. -const char kDisableLocalStorage[] = "disable-local-storage"; +const char kDisableLocalStorage[] = "disable-local-storage"; // Force logging to be disabled. Logging is enabled by default in debug // builds. @@ -253,9 +256,6 @@ const char kEnableFileCookies[] = "enable-file-cookies"; // Enable the Indexed Database API. const char kEnableIndexedDatabase[] = "enable-indexed-database"; -// Enable the internal Flash Player (if available). -const char kEnableInternalFlash[] = "enable-internal-flash"; - // 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 62f2ead..3b541b9 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -49,6 +49,7 @@ extern const char kDisableDevTools[]; extern const char kDisableExtensions[]; extern const char kDisableGeolocation[]; extern const char kDisableHangMonitor[]; +extern const char kDisableInternalFlash[]; extern const char kDisableIPv6[]; extern const char kDisableJavaScript[]; extern const char kDisableJava[]; @@ -90,7 +91,6 @@ extern const char kEnableFileCookies[]; extern const char kEnableGPUPlugin[]; extern const char kEnableGPURendering[]; extern const char kEnableIndexedDatabase[]; -extern const char kEnableInternalFlash[]; extern const char kEnableIPv6[]; extern const char kEnableLogging[]; extern const char kEnableMonitorProfile[]; |