chrome/browser/ui/content_settings/content_setting_bubble_model.cc - Issue 12086077: Only permit plug-in loads in the browser if the plug-in isn't blocked or the

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

Issue 12086077: Only permit plug-in loads in the browser if the plug-in isn't blocked or the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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

« chrome/browser/plugins/chrome_plugin_service_filter.cc ('K') | « chrome/browser/tab_contents/render_view_context_menu.cc ('k') | content/browser/pepper_flash_settings_helper_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

===================================================================

--- chrome/browser/ui/content_settings/content_setting_bubble_model.cc (revision 179787)

+++ chrome/browser/ui/content_settings/content_setting_bubble_model.cc (working copy)

@@ -12,6 +12,7 @@

#include "chrome/browser/custom_handlers/protocol_handler_registry.h"

#include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"

#include "chrome/browser/favicon/favicon_tab_helper.h"

+#include "chrome/browser/plugins/chrome_plugin_service_filter.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"

@@ -23,6 +24,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

#include "content/public/browser/notification_service.h"

+#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

@@ -427,6 +429,8 @@

DCHECK(web_contents());

content::RenderViewHost* host = web_contents()->GetRenderViewHost();

// TODO(bauerb): We should send the identifiers of blocked plug-ins here.

+ ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(

+ host->GetProcess()->GetID());

host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->GetRoutingID(),

std::string()));

set_custom_link_enabled(false);