Remove NOTIFICATION_EXTENSION_LOADED_DEPRECATED from MenuManager.

chrome/browser/extensions/menu_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/menu_manager.h"
 
 #include <algorithm>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/guestview/webview/webview_guest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/context_menus.h"
 #include "chrome/common/extensions/api/webview.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/context_menu_params.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 "extensions/common/manifest_handlers/background_info.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/text_elider.h"
 
 using content::WebContents;
 using extensions::ExtensionSystem;
 
 namespace extensions {
@@ skipping 254 matching lines @@
     }
   }
   return true;
 }
 
 // static
 const char MenuManager::kOnContextMenus[] = "contextMenus";
 const char MenuManager::kOnWebviewContextMenus[] = "webview.contextMenus";
 
 MenuManager::MenuManager(Profile* profile, StateStore* store)
-    : profile_(profile), store_(store) {
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                 content::Source<Profile>(profile));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-                 content::Source<Profile>(profile));
+    : extension_registry_observer_(this), profile_(profile), store_(store) {
+  extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
                  content::NotificationService::AllSources());
   if (store_)
     store_->RegisterKey(kContextMenusKey);
 }
 
 MenuManager::~MenuManager() {
   MenuItemMap::iterator i;
   for (i = context_items_.begin(); i != context_items_.end(); ++i) {
     STLDeleteElements(&(i->second));
@@ skipping 503 matching lines @@
       added = AddChildItem(*parent_id, items[i]);
     } else {
       added = AddContextItem(extension, items[i]);
     }
 
     if (!added)
       delete items[i];
   }
 }
 
+void MenuManager::OnExtensionLoaded(content::BrowserContext* browser_context,
+                                    const Extension* extension) {
+  if (store_ && BackgroundInfo::HasLazyBackgroundPage(extension)) {
+    store_->GetExtensionValue(
+        extension->id(),
+        kContextMenusKey,
+        base::Bind(
+            &MenuManager::ReadFromStorage, AsWeakPtr(), extension->id()));
+  }
+}
+
+void MenuManager::OnExtensionUnloaded(content::BrowserContext* browser_context,
+                                      const Extension* extension,
+                                      UnloadedExtensionInfo::Reason reason) {
+  MenuItem::ExtensionKey extension_key(extension->id());
+  if (ContainsKey(context_items_, extension_key)) {
+    RemoveAllContextItems(extension_key);
+  }
+}
+
 void MenuManager::Observe(int type,
                           const content::NotificationSource& source,
                           const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED: {
-      // Remove menu items for disabled/uninstalled extensions.
-      const Extension* extension =
-          content::Details<UnloadedExtensionInfo>(details)->extension;
-      MenuItem::ExtensionKey extension_key(extension->id());
-      if (ContainsKey(context_items_, extension_key)) {
-        RemoveAllContextItems(extension_key);
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
-      const Extension* extension =
-          content::Details<const Extension>(details).ptr();
-      if (store_ && BackgroundInfo::HasLazyBackgroundPage(extension)) {
-        store_->GetExtensionValue(extension->id(), kContextMenusKey,
-            base::Bind(&MenuManager::ReadFromStorage,
-                       AsWeakPtr(), extension->id()));
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_PROFILE_DESTROYED: {
-      Profile* profile = content::Source<Profile>(source).ptr();
-      // We cannot use profile_->HasOffTheRecordProfile as it may already be
-      // false at this point, if for example the incognito profile was destroyed
-      // using DestroyOffTheRecordProfile.
-      if (profile->GetOriginalProfile() == profile_ &&
-          profile->GetOriginalProfile() != profile) {
-        RemoveAllIncognitoContextItems();
-      }
-      break;
-    }
-    default:
-      NOTREACHED();
-      break;
+  DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
+  Profile* profile = content::Source<Profile>(source).ptr();
+  // We cannot use profile_->HasOffTheRecordProfile as it may already be
+  // false at this point, if for example the incognito profile was destroyed
+  // using DestroyOffTheRecordProfile.
+  if (profile->GetOriginalProfile() == profile_ &&
+      profile->GetOriginalProfile() != profile) {
+    RemoveAllIncognitoContextItems();
   }
 }
 
 const SkBitmap& MenuManager::GetIconForExtension(
     const std::string& extension_id) {
   return icon_manager_.GetIcon(extension_id);
 }
 
 void MenuManager::RemoveAllIncognitoContextItems() {
   // Get all context menu items with "incognito" set to "split".
@@ skipping 70 matching lines @@
       if (uid < other.uid)
         return true;
       if (uid == other.uid)
         return string_uid < other.string_uid;
     }
   }
   return false;
 }
 
 }  // namespace extensions