summaryrefslogtreecommitdiffstats
path: root/chrome/default_plugin/plugin_impl_gtk.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 23:12:35 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 23:12:35 +0000
commite0e75f67163f77051d8f62d5275dbf40627d5398 (patch)
tree070d431dc290d9b9a69c79ceeb94ba7574ef1c31 /chrome/default_plugin/plugin_impl_gtk.cc
parent3370e3b7ee18664a43a9977efeab2166624d0a32 (diff)
downloadchromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.zip
chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.gz
chromium_src-e0e75f67163f77051d8f62d5275dbf40627d5398.tar.bz2
Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace. BUG=none TEST=none Review URL: http://codereview.chromium.org/6012002 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/5961004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin/plugin_impl_gtk.cc')
-rw-r--r--chrome/default_plugin/plugin_impl_gtk.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/default_plugin/plugin_impl_gtk.cc b/chrome/default_plugin/plugin_impl_gtk.cc
index b6dc38a..ae7dfb2 100644
--- a/chrome/default_plugin/plugin_impl_gtk.cc
+++ b/chrome/default_plugin/plugin_impl_gtk.cc
@@ -14,7 +14,7 @@
#include "grit/webkit_strings.h"
#include "unicode/locid.h"
#include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/default_plugin_shared.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
// TODO(thakis): Most methods in this class are stubbed out an need to be
// implemented.
@@ -137,6 +137,6 @@ void PluginInstallerImpl::NotifyPluginStatus(int status) {
default_plugin::g_browser->getvalue(
instance_,
static_cast<NPNVariable>(
- webkit::npapi::default_plugin::kMissingPluginStatusStart + status),
+ default_plugin::kMissingPluginStatusStart + status),
NULL);
}