chrome/browser/content_settings/tab_specific_content_settings.cc - Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing

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/content_settings/tab_specific_content_settings.cc

Issue 319553008: Updated Plugin bubble model to add "learn more" link and to appear with a sliding yellow thing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed comments Created 6 years, 6 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/content_settings/tab_specific_content_settings.h ('K') | « chrome/browser/content_settings/tab_specific_content_settings.h ('k') | chrome/browser/ui/browser_content_setting_bubble_model_delegate.h » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/tab_specific_content_settings.cc

diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc

index 7de878d869c2641d030433ad7d6ecdbf54ad37f5..e927dbf0fb38e3894c0aada3c189dec64b40a6fa 100644

--- a/chrome/browser/content_settings/tab_specific_content_settings.cc

+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc

@@ -69,7 +69,7 @@ TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)

pending_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),

previous_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),

pending_protocol_handler_setting_(CONTENT_SETTING_DEFAULT),

- load_plugins_link_enabled_(true) {

+ plugin_bubble_setting_(CONTENT_SETTING_BLOCK) {

ClearBlockedContentSettingsExceptForCookies();

ClearCookieSpecificContentSettings();

@@ -565,7 +565,6 @@ void TabSpecificContentSettings::ClearBlockedContentSettingsExceptForCookies() {

content_allowed_[i] = false;

content_blockage_indicated_to_user_[i] = false;

}

- load_plugins_link_enabled_ = true;

content::NotificationService::current()->Notify(

chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,

content::Source<WebContents>(web_contents()),