diff options
author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
---|---|---|
committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
commit | b6badfa6a538f889025db775662fe61fcb45dc37 (patch) | |
tree | d12fb54a46443e18a9fa9a671392966ba6751202 /webkit/plugins/plugin_switches.h | |
parent | e0e75f67163f77051d8f62d5275dbf40627d5398 (diff) | |
download | chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.zip chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.gz chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.bz2 |
Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69766, which was itself a failed
revert of r69755.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5996003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/plugin_switches.h')
-rw-r--r-- | webkit/plugins/plugin_switches.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/plugins/plugin_switches.h b/webkit/plugins/plugin_switches.h index 7497ec1..8f5aa3c 100644 --- a/webkit/plugins/plugin_switches.h +++ b/webkit/plugins/plugin_switches.h @@ -5,11 +5,17 @@ #ifndef WEBKIT_PLUGINS_PLUGIN_SWITCHES_H_ #define WEBKIT_PLUGINS_PLUGIN_SWITCHES_H_ +#include "build/build_config.h" + namespace switches { extern const char kDebugPluginLoading[]; extern const char kEnablePepperTesting[]; +#if defined(OS_WIN) +extern const char kUseOldWMPPlugin[]; +#endif + } // namespace switches #endif // WEBKIT_PLUGINS_PLUGIN_SWITCHES_H_ |