diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 22:02:44 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 22:02:44 +0000 |
| commit | e317c9a117b6f365cd6e596dc7e4d1d1365f53a0 (patch) | |
| tree | 55e6a2dfe29972c3996d31a14dbba24a061f55fd /chrome/common/chrome_plugin_lib.cc | |
| parent | 7ae80749da2e8caa8155984be0970ac20a42a04a (diff) | |
| download | chromium_src-e317c9a117b6f365cd6e596dc7e4d1d1365f53a0.zip chromium_src-e317c9a117b6f365cd6e596dc7e4d1d1365f53a0.tar.gz chromium_src-e317c9a117b6f365cd6e596dc7e4d1d1365f53a0.tar.bz2 | |
Temporary stuff for internal plugins, part 1.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1320002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42674 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, 4 insertions, 1 deletions
diff --git a/chrome/common/chrome_plugin_lib.cc b/chrome/common/chrome_plugin_lib.cc index eb6bd3e..ceb4e54 100644 --- a/chrome/common/chrome_plugin_lib.cc +++ b/chrome/common/chrome_plugin_lib.cc @@ -117,7 +117,10 @@ void ChromePluginLib::RegisterPluginsWithNPAPI() { NPAPI::PluginList::Singleton()->AddExtraPluginPath(path); // Register the internal Flash, if available. - if (PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) + // TODO(viettrungluu): The command-line switch is temporary. + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableInternalFlash) && + PathService::Get(chrome::FILE_FLASH_PLUGIN, &path)) NPAPI::PluginList::Singleton()->AddExtraPluginPath(path); } |