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 /chrome/default_plugin/plugin_impl_mac.mm | |
| 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 'chrome/default_plugin/plugin_impl_mac.mm')
| -rw-r--r-- | chrome/default_plugin/plugin_impl_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm index 0bad41b..f964023 100644 --- a/chrome/default_plugin/plugin_impl_mac.mm +++ b/chrome/default_plugin/plugin_impl_mac.mm @@ -17,7 +17,7 @@ #include "grit/webkit_strings.h" #include "unicode/locid.h" #include "webkit/glue/webkit_glue.h" -#include "webkit/glue/plugins/default_plugin_shared.h" +#include "webkit/plugins/npapi/default_plugin_shared.h" // TODO(thakis): Most methods in this class are stubbed out and need to be // implemented. @@ -194,6 +194,6 @@ void PluginInstallerImpl::NotifyPluginStatus(int status) { default_plugin::g_browser->getvalue( instance_, static_cast<NPNVariable>( - default_plugin::kMissingPluginStatusStart + status), + webkit::npapi::default_plugin::kMissingPluginStatusStart + status), NULL); } |