chrome/browser/ui/webui/options/content_settings_handler.cc - Issue 8342048: Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

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/webui/options/content_settings_handler.cc

Issue 8342048: Make NotificationService an interface in the content namespace, and switch callers to use it. Mov... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 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/webui/options/chromeos/internet_options_handler.cc ('k') | chrome/browser/ui/webui/options/extension_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/content_settings_handler.cc

===================================================================

--- chrome/browser/ui/webui/options/content_settings_handler.cc (revision 106380)

+++ chrome/browser/ui/webui/options/content_settings_handler.cc (working copy)

@@ -28,7 +28,7 @@

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

#include "content/browser/tab_contents/tab_contents.h"

-#include "content/common/notification_service.h"

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

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

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

#include "content/public/common/content_switches.h"

@@ -277,19 +277,19 @@

void ContentSettingsHandler::Initialize() {

notification_registrar_.Add(

this, chrome::NOTIFICATION_PROFILE_CREATED,

- NotificationService::AllSources());

+ content::NotificationService::AllSources());

notification_registrar_.Add(

this, chrome::NOTIFICATION_PROFILE_DESTROYED,

- NotificationService::AllSources());

+ content::NotificationService::AllSources());

UpdateHandlersEnabledRadios();

UpdateAllExceptionsViewsFromModel();

notification_registrar_.Add(

this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED,

- NotificationService::AllSources());

+ content::NotificationService::AllSources());

notification_registrar_.Add(

this, chrome::NOTIFICATION_DESKTOP_NOTIFICATION_SETTINGS_CHANGED,

- NotificationService::AllSources());

+ content::NotificationService::AllSources());

Profile* profile = Profile::FromWebUI(web_ui_);

notification_registrar_.Add(

this, chrome::NOTIFICATION_PROTOCOL_HANDLER_REGISTRY_CHANGED,