chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - Issue 670953006: Componentize HostContentSettingsMap and content settings providers.

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/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 670953006: Componentize HostContentSettingsMap and content settings providers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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/ui/browser_browsertest.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | components/components_tests.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

index 3bddbbc235b7a9b3b5e343a57ec8032dc5780c43..92ad9aa7b0ef24a4fb039664c41dc677fd30c8b0 100644

--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -9,7 +9,6 @@

#include "base/stl_util.h"

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/browser/content_settings/host_content_settings_map.h"

#include "chrome/browser/plugins/plugin_finder.h"

#include "chrome/browser/plugins/plugin_metadata.h"

#import "chrome/browser/ui/cocoa/info_bubble_view.h"

@@ -17,6 +16,7 @@

#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"

#include "chrome/browser/ui/content_settings/content_setting_media_menu_model.h"

#include "chrome/grit/generated_resources.h"

+#include "components/content_settings/core/browser/host_content_settings_map.h"

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

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

#include "skia/ext/skia_utils_mac.h"