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

Unified Diff: chrome/browser/printing/print_preview_tab_controller.cc

Issue 7387010: Add PluginServiceFilter interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix unit test Created 9 years, 4 months 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
« no previous file with comments | « chrome/browser/plugin_prefs.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_preview_tab_controller.cc
diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc
index 6f5078c10ed657bbd20ef4bad85dd84706e26bfc..cdcb02c8a286ada2ef464c63629e409190bc4b53 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_tab_controller.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_plugin_service_filter.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/restore_tab_helper.h"
@@ -21,7 +22,6 @@
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
-#include "content/browser/plugin_service.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/tab_contents/navigation_details.h"
#include "content/browser/tab_contents/tab_contents.h"
@@ -55,13 +55,13 @@ void EnableInternalPDFPluginForTab(TabContentsWrapper* preview_tab) {
std::vector<WebPluginInfo> plugins = internal_pdf_group->web_plugin_infos();
DCHECK_EQ(plugins.size(), 1U);
- PluginService::OverriddenPlugin plugin;
- plugin.render_process_id = preview_tab->render_view_host()->process()->id();
- plugin.render_view_id = preview_tab->render_view_host()->routing_id();
- plugin.plugin = plugins[0];
- plugin.plugin.enabled = WebPluginInfo::USER_ENABLED;
-
- PluginService::GetInstance()->OverridePluginForTab(plugin);
+ webkit::WebPluginInfo plugin = plugins[0];
+ plugin.enabled = WebPluginInfo::USER_ENABLED;
+ ChromePluginServiceFilter::GetInstance()->OverridePluginForTab(
+ preview_tab->render_view_host()->process()->id(),
+ preview_tab->render_view_host()->routing_id(),
+ GURL(),
+ plugin);
}
}
« no previous file with comments | « chrome/browser/plugin_prefs.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698