Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6750)

Unified Diff: chrome/browser/plugin_exceptions_table_model.cc

Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/plugin_exceptions_table_model.cc
===================================================================
--- chrome/browser/plugin_exceptions_table_model.cc (revision 69765)
+++ chrome/browser/plugin_exceptions_table_model.cc (working copy)
@@ -134,13 +134,13 @@
}
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();
« no previous file with comments | « chrome/browser/plugin_exceptions_table_model.h ('k') | chrome/browser/plugin_exceptions_table_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698