chrome/browser/content_settings/tab_specific_content_settings.cc - Issue 1025503002: Use same base class for popup and plugin blocking UI

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 1025503002: Use same base class for popup and plugin blocking UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix cocoa code Created 5 years, 9 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/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('j') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm » ('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 e1d8a6364952844f84344609162c9c01787ffdc9..364c7d52692e87dda785b37131281c297b2e742b 100644

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

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

@@ -236,10 +236,6 @@ void TabSpecificContentSettings::FileSystemAccessed(int render_process_id,

settings->OnFileSystemAccessed(url, blocked_by_policy);

}

-const base::string16 TabSpecificContentSettings::GetBlockedPluginNames() const {

- return JoinString(blocked_plugin_names_, base::ASCIIToUTF16(", "));

bool TabSpecificContentSettings::IsContentBlocked(

ContentSettingsType content_type) const {

DCHECK(content_type != CONTENT_SETTINGS_TYPE_GEOLOCATION)