summaryrefslogtreecommitdiffstats
path: root/chrome/browser/mock_plugin_exceptions_table_model.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/browser/mock_plugin_exceptions_table_model.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/browser/mock_plugin_exceptions_table_model.cc')
-rw-r--r--chrome/browser/mock_plugin_exceptions_table_model.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/mock_plugin_exceptions_table_model.cc b/chrome/browser/mock_plugin_exceptions_table_model.cc
index 1c88524..77b2a2f 100644
--- a/chrome/browser/mock_plugin_exceptions_table_model.cc
+++ b/chrome/browser/mock_plugin_exceptions_table_model.cc
@@ -5,11 +5,11 @@
#include "chrome/browser/mock_plugin_exceptions_table_model.h"
void MockPluginExceptionsTableModel::set_plugins(
- std::vector<webkit::npapi::PluginGroup>& plugins) {
+ std::vector<PluginGroup>& plugins) {
plugins_ = plugins;
}
void MockPluginExceptionsTableModel::GetPlugins(
- std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
+ std::vector<PluginGroup>* plugin_groups) {
*plugin_groups = plugins_;
}