chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc - Issue 425303002: Move extension notifications to extensions/browser/notification_types.h

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/extensions/api/system_indicator/system_indicator_manager.cc

Issue 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: (extension-notifications) rebase Created 6 years, 5 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/extensions/api/screenlock_private/screenlock_private_apitest.cc ('k') | chrome/browser/extensions/bookmark_app_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc

diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc

index 4dc30368ea85c4f07ad9f6fdb5010d551c3c510b..2260090fc854b0a6ab0989fae4333fff79a5b007 100644

--- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc

+++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc

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

#include "base/memory/linked_ptr.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/browser/chrome_notification_types.h"

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

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

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

@@ -19,6 +18,7 @@

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_registry.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/browser/notification_types.h"

#include "extensions/common/extension.h"

#include "ui/gfx/image/image.h"

@@ -127,7 +127,8 @@ SystemIndicatorManager::SystemIndicatorManager(Profile* profile,

extension_registry_observer_(this) {

extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));

- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED,

+ registrar_.Add(this,

+ extensions::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED,

content::Source<Profile>(profile_->GetOriginalProfile()));

}

@@ -151,7 +152,7 @@ void SystemIndicatorManager::Observe(

const content::NotificationSource& source,

const content::NotificationDetails& details) {

DCHECK(thread_checker_.CalledOnValidThread());

- DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED);

+ DCHECK_EQ(type, extensions::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED);

OnSystemIndicatorChanged(content::Details<ExtensionAction>(details).ptr());

}