diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 00:39:18 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-12 00:39:18 +0000 |
| commit | 449678864a0326d07ed1ea3f91de8044abd5a7a9 (patch) | |
| tree | 25b67ffac8071079289483e32df032651630f85d /chrome/common/chrome_plugin_lib.cc | |
| parent | 5425d069ab8c48bb28cda2cd7b746ae5e8443605 (diff) | |
| download | chromium_src-449678864a0326d07ed1ea3f91de8044abd5a7a9.zip chromium_src-449678864a0326d07ed1ea3f91de8044abd5a7a9.tar.gz chromium_src-449678864a0326d07ed1ea3f91de8044abd5a7a9.tar.bz2 | |
Turn on internal Flash Player by default.
BUG=none
TEST=Run a branded Google Chrome (without any command-line flags); check about:plugins to make sure it picks up the internal Flash. Run it with --disable-internal-flash; check about:plugins to make sure it doesn't pick up the internal Flash.
Review URL: http://codereview.chromium.org/1564025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44223 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_plugin_lib.cc')
| -rw-r--r-- | chrome/common/chrome_plugin_lib.cc | 5 |
1 files changed, 2 insertions, 3 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); } |