From e0e75f67163f77051d8f62d5275dbf40627d5398 Mon Sep 17 00:00:00 2001
From: "brettw@chromium.org"
 <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 20 Dec 2010 23:12:35 +0000
Subject: 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
---
 chrome/browser/plugin_exceptions_table_model.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'chrome/browser/plugin_exceptions_table_model.cc')

diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc
index 5b2a2c1..7ad5b13 100644
--- a/chrome/browser/plugin_exceptions_table_model.cc
+++ b/chrome/browser/plugin_exceptions_table_model.cc
@@ -134,13 +134,13 @@ void PluginExceptionsTableModel::ClearSettings() {
 }
 
 void PluginExceptionsTableModel::GetPlugins(
-    std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
-  webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
+    std::vector<PluginGroup>* plugin_groups) {
+  NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
-  std::vector<webkit::npapi::PluginGroup> plugins;
+  std::vector<PluginGroup> plugins;
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();
-- 
cgit v1.1