chrome/browser/notifications/message_center_settings_controller.cc - 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/notifications/message_center_settings_controller.cc

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

Patch Set: win64 suppress warnings 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/notifications/desktop_notification_profile_util.cc ('k') | chrome/browser/notifications/notification_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/message_center_settings_controller.cc

diff --git a/chrome/browser/notifications/message_center_settings_controller.cc b/chrome/browser/notifications/message_center_settings_controller.cc

index af43b14e1e7bfac626db5f50c1acbf9d5e2f9ff9..5b8d0a2eb2331ac625caf05ee0f979d5f62b02f8 100644

--- a/chrome/browser/notifications/message_center_settings_controller.cc

+++ b/chrome/browser/notifications/message_center_settings_controller.cc

@@ -13,7 +13,6 @@

#include "base/task/cancelable_task_tracker.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chrome_notification_types.h"

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

#include "chrome/browser/extensions/app_icon_loader_impl.h"

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

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

@@ -27,6 +26,7 @@

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

#include "chrome/common/extensions/api/notifications.h"

#include "chrome/common/extensions/extension_constants.h"

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

#include "components/favicon_base/favicon_types.h"

#include "components/history/core/browser/history_types.h"

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