diff options
| author | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-20 21:54:41 +0000 |
|---|---|---|
| committer | limasdf@gmail.com <limasdf@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-20 21:54:41 +0000 |
| commit | fdc76195de53719adc66df4aee6488e02b476c24 (patch) | |
| tree | 053298bc43d4bfbf1599c787c79fc9b4c3446099 /extensions/browser | |
| parent | 91765737273790b4decc392da2441c3bb1e3f25c (diff) | |
| download | chromium_src-fdc76195de53719adc66df4aee6488e02b476c24.zip chromium_src-fdc76195de53719adc66df4aee6488e02b476c24.tar.gz chromium_src-fdc76195de53719adc66df4aee6488e02b476c24.tar.bz2 | |
Replace NOTIFICATION_EXTENSION_LOADED to NOTIFICATION_EXTENSION_LOADED_DEPRECATED
to have bidirect with NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED.
This CL is the result of below script, and 'git cl format'.
find -regex '.*/.*\.\(mm\|cc\|h\)$' | xargs sed -i s/NOTIFICATION_EXTENSION_LOADED/NOTIFICATION_EXTENSION_LOADED_DEPRECATED/g
BUG=354367
Review URL: https://codereview.chromium.org/242613004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser')
| -rw-r--r-- | extensions/browser/event_router.cc | 5 | ||||
| -rw-r--r-- | extensions/browser/process_manager.cc | 5 | ||||
| -rw-r--r-- | extensions/browser/process_manager_unittest.cc | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/extensions/browser/event_router.cc b/extensions/browser/event_router.cc index 4a165e3..f2fc8a9 100644 --- a/extensions/browser/event_router.cc +++ b/extensions/browser/event_router.cc @@ -173,7 +173,8 @@ EventRouter::EventRouter(BrowserContext* browser_context, content::NotificationService::AllSources()); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_ENABLED, content::Source<BrowserContext>(browser_context_)); - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, + registrar_.Add(this, + chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, content::Source<BrowserContext>(browser_context_)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, content::Source<BrowserContext>(browser_context_)); @@ -690,7 +691,7 @@ void EventRouter::Observe(int type, } break; } - case chrome::NOTIFICATION_EXTENSION_LOADED: { + case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: { // Add all registered lazy listeners to our cache. const Extension* extension = content::Details<const Extension>(details).ptr(); diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc index f97a722..9e5f0c6 100644 --- a/extensions/browser/process_manager.cc +++ b/extensions/browser/process_manager.cc @@ -229,7 +229,8 @@ ProcessManager::ProcessManager(BrowserContext* context, weak_ptr_factory_(this) { registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY, content::Source<BrowserContext>(original_context)); - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, + registrar_.Add(this, + chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, content::Source<BrowserContext>(original_context)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, content::Source<BrowserContext>(original_context)); @@ -650,7 +651,7 @@ void ProcessManager::Observe(int type, break; } - case chrome::NOTIFICATION_EXTENSION_LOADED: { + case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: { BrowserContext* context = content::Source<BrowserContext>(source).ptr(); ExtensionSystem* system = ExtensionSystem::Get(context); if (system->ready().is_signaled()) { diff --git a/extensions/browser/process_manager_unittest.cc b/extensions/browser/process_manager_unittest.cc index c71f526..b72b112 100644 --- a/extensions/browser/process_manager_unittest.cc +++ b/extensions/browser/process_manager_unittest.cc @@ -80,7 +80,7 @@ TEST_F(ProcessManagerTest, ExtensionNotificationRegistration) { chrome::NOTIFICATION_EXTENSIONS_READY, original_context())); EXPECT_TRUE(IsRegistered(manager1.get(), - chrome::NOTIFICATION_EXTENSION_LOADED, + chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, original_context())); EXPECT_TRUE(IsRegistered(manager1.get(), chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, @@ -98,7 +98,7 @@ TEST_F(ProcessManagerTest, ExtensionNotificationRegistration) { // Some notifications are observed for the original context. EXPECT_TRUE(IsRegistered(manager2.get(), - chrome::NOTIFICATION_EXTENSION_LOADED, + chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, original_context())); // Some notifications are observed for the incognito context. |