chrome/browser/extensions/api/bluetooth/bluetooth_event_router.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/bluetooth/bluetooth_event_router.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/download/chrome_download_manager_delegate.cc ('k') | chrome/browser/extensions/api/bookmarks/bookmarks_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

index 348b25344d238cd186214bd08facfda3c94a0d5d..f420726ae8019a30d3747be5e5c4a7ffdb351e31 100644

--- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc

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

#include "base/memory/scoped_vector.h"

#include "base/stl_util.h"

#include "base/strings/utf_string_conversions.h"

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

#include "chrome/browser/extensions/api/bluetooth/bluetooth_api_pairing_delegate.h"

#include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h"

#include "chrome/browser/extensions/api/bluetooth/bluetooth_private_api.h"

@@ -30,6 +29,7 @@

#include "extensions/browser/event_router.h"

#include "extensions/browser/extension_host.h"

#include "extensions/browser/extension_registry.h"

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

namespace extensions {

@@ -45,7 +45,7 @@ BluetoothEventRouter::BluetoothEventRouter(content::BrowserContext* context)

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

DCHECK(browser_context_);

registrar_.Add(this,

- chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,

+ extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED,

content::Source<content::BrowserContext>(browser_context_));

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

}

@@ -352,7 +352,7 @@ void BluetoothEventRouter::Observe(

const content::NotificationSource& source,

const content::NotificationDetails& details) {

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));

- DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED, type);

+ DCHECK_EQ(extensions::NOTIFICATION_EXTENSION_HOST_DESTROYED, type);

ExtensionHost* host = content::Details<ExtensionHost>(details).ptr();

CleanUpForExtension(host->extension_id());

}