Remove NOTIFICATION_EXTENSION_UNLOADED from system_indicator API.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager.h"
 
 #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"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_icon_observer.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/common/extensions/api/system_indicator.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/event_router.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "ui/gfx/image/image.h"
 
 namespace extensions {
 
 namespace system_indicator = api::system_indicator;
 
 // Observes clicks on a given status icon and forwards the event to the
 // appropriate extension.  Handles icon updates, and responsible for creating
@@ skipping 47 matching lines @@
   if (icon_) {
     icon_->RemoveObserver(this);
     status_tray_->RemoveStatusIcon(icon_);
   }
 }
 
 void ExtensionIndicatorIcon::OnStatusIconClicked() {
   scoped_ptr<base::ListValue> params(
       api::system_indicator::OnClicked::Create());
 
-  EventRouter* event_router = EventRouter::Get(profile_);
   scoped_ptr<Event> event(new Event(
       system_indicator::OnClicked::kEventName,
       params.Pass(),
       profile_));
-  event_router->DispatchEventToExtension(
-      extension_->id(), event.Pass());
+  EventRouter::Get(profile_)
+      ->DispatchEventToExtension(extension_->id(), event.Pass());

[dewittj, 2014/04/28 21:25:49]

Don't really need to change this eh?

[limasdf, 2014/04/28 22:51:40]

Yes it doesnt really need to be change. But |event_router| is used exactly only
once. And we can reduce 1 code line here.
Sounds good?

[dewittj, 2014/04/28 23:34:52]

I know it sounds pedantic, but I'd rather the patch be focused and include only
formatting updates that are relevant to the actual lines changed.

[limasdf, 2014/04/29 00:09:29]

Yeah. Exactly. Thanks you for letting me know good habit!
Done.

 }
 
 void ExtensionIndicatorIcon::OnIconUpdated() {
   icon_->SetImage(
       icon_factory_.GetIcon(ExtensionAction::kDefaultTabId).AsImageSkia());
 }
 
 ExtensionIndicatorIcon::ExtensionIndicatorIcon(const Extension* extension,
                                                const ExtensionAction* action,
                                                Profile* profile,
@@ skipping 10 matching lines @@
   base::string16 tool_tip = base::UTF8ToUTF16(extension_->name());
 
   icon_ = status_tray_->CreateStatusIcon(
       StatusTray::OTHER_ICON, icon_image, tool_tip);
   if (icon_)
     icon_->AddObserver(this);
 }
 
 SystemIndicatorManager::SystemIndicatorManager(Profile* profile,
                                                StatusTray* status_tray)
-    : profile_(profile), status_tray_(status_tray) {
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile_->GetOriginalProfile()));
+    : profile_(profile),
+      status_tray_(status_tray),
+      extension_registry_observer_(this) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
+
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED,
                  content::Source<Profile>(profile_->GetOriginalProfile()));
 }
 
 SystemIndicatorManager::~SystemIndicatorManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void SystemIndicatorManager::Shutdown() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
+void SystemIndicatorManager::OnExtensionUnloaded(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    UnloadedExtensionInfo::Reason reason) {
+  RemoveIndicator(extension->id());
+}
+
 void SystemIndicatorManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED);
 
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
-      RemoveIndicator(
-          content::Details<UnloadedExtensionInfo>(details)->extension->id());
-      break;
-    case chrome::NOTIFICATION_EXTENSION_SYSTEM_INDICATOR_UPDATED:
-      OnSystemIndicatorChanged(
-          content::Details<ExtensionAction>(details).ptr());
-      break;
-    default:
-      NOTREACHED();
-      break;
-  }
+  OnSystemIndicatorChanged(content::Details<ExtensionAction>(details).ptr());
 }
 
 void SystemIndicatorManager::OnSystemIndicatorChanged(
     const ExtensionAction* extension_action) {
   DCHECK(thread_checker_.CalledOnValidThread());
   std::string extension_id = extension_action->extension_id();
   ExtensionService* service =
       ExtensionSystem::Get(profile_)->extension_service();
 
   if (extension_action->GetIsVisible(ExtensionAction::kDefaultTabId)) {
@@ skipping 33 matching lines @@
   if (extension_icon)
     system_indicators_[extension->id()] = make_linked_ptr(extension_icon);
 }
 
 void SystemIndicatorManager::RemoveIndicator(const std::string& extension_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   system_indicators_.erase(extension_id);
 }
 
 }  // namespace extensions