chrome/browser/chromeos/locale_change_guard.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/chromeos/locale_change_guard.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/chromeos/input_method/input_method_manager.cc ('k') | chrome/browser/chromeos/login/base_login_display_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/locale_change_guard.cc

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

--- chrome/browser/chromeos/locale_change_guard.cc (revision 106380)

+++ chrome/browser/chromeos/locale_change_guard.cc (working copy)

@@ -16,7 +16,7 @@

#include "chrome/common/pref_names.h"

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

#include "content/browser/user_metrics.h"

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

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

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

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

@@ -45,14 +45,14 @@

reverted_(false) {

DCHECK(profile_);

registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_CHECKED,

- NotificationService::AllSources());

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

}

LocaleChangeGuard::~LocaleChangeGuard() {}

void LocaleChangeGuard::OnLogin() {

registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,

- NotificationService::AllBrowserContextsAndSources());

+ content::NotificationService::AllBrowserContextsAndSources());

}

void LocaleChangeGuard::RevertLocaleChange(const ListValue* list) {

@@ -87,7 +87,7 @@

if (profile_ == content::Source<TabContents>(source)->browser_context()) {

// We need to perform locale change check only once, so unsubscribe.

registrar_.Remove(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,

- NotificationService::AllSources());

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

Check();

}

break;