chrome/browser/notifications/message_center_settings_controller.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

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 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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/content_settings_details.h ('K') | « chrome/browser/media/media_stream_devices_controller.cc ('k') | chrome/browser/plugins/plugin_info_message_filter_unittest.cc » ('j') | chrome/common/chrome_content_settings_client.h » ('J')
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 1e82df5aab71f045f723f33fef0f61a1e9f7f30b..4cc061f94308b7e7312739ab7f7be0f94ada8a8c 100644

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

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

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

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

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

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

+#include "chrome/common/chrome_content_settings_client.h"

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

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

#include "components/favicon_base/favicon_types.h"

@@ -257,7 +258,8 @@ void MessageCenterSettingsController::GetNotifierList(

continue;

}

- std::string url_pattern = iter->primary_pattern.ToString();

+ content_settings::ChromeContentSettingsClient client;

+ std::string url_pattern = iter->primary_pattern.ToString(&client);

base::string16 name = base::UTF8ToUTF16(url_pattern);

GURL url(url_pattern);

NotifierId notifier_id(url);