diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 19:37:06 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 19:37:06 +0000 |
| commit | aad50b83a76618768f9232c21b4c9f4401c13c51 (patch) | |
| tree | 42eaa8a023ffadd8621d26d4dc401e9f71d8e797 /chrome/common/default_plugin.cc | |
| parent | 49d2796dd7fb3457738adde97e7cf2fdf889811b (diff) | |
| download | chromium_src-aad50b83a76618768f9232c21b4c9f4401c13c51.zip chromium_src-aad50b83a76618768f9232c21b4c9f4401c13c51.tar.gz chromium_src-aad50b83a76618768f9232c21b4c9f4401c13c51.tar.bz2 | |
Disable the default plugin for aura
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/8143024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104154 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/default_plugin.cc')
| -rw-r--r-- | chrome/common/default_plugin.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/common/default_plugin.cc b/chrome/common/default_plugin.cc index 4acc6b7..26d95bf 100644 --- a/chrome/common/default_plugin.cc +++ b/chrome/common/default_plugin.cc @@ -10,10 +10,11 @@ namespace chrome { void RegisterInternalDefaultPlugin() { -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) // TODO(bauerb): On Windows the default plug-in can download and install // missing plug-ins, which we don't support in the browser yet, so keep // using the default plug-in on Windows until we do. + // Aura isn't going to support NPAPI plugins. const webkit::npapi::PluginEntryPoints entry_points = { #if !defined(OS_POSIX) || defined(OS_MACOSX) default_plugin::NP_GetEntryPoints, @@ -28,7 +29,7 @@ void RegisterInternalDefaultPlugin() { "Provides functionality for installing third-party plug-ins", "*", entry_points); -#endif // defined OS(WIN) +#endif } } // namespace chrome |