cleanup: Remove NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED from c/b/apps

chrome/browser/apps/shortcut_manager.cc

 // Copyright 2013 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/apps/shortcut_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_ui_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
+#include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension_set.h"
 
 using extensions::Extension;
 
 namespace {
 
 // Creates a shortcut for an application in the applications menu, if there is
 // not already one present.
 void CreateShortcutsInApplicationsMenu(Profile* profile,
@@ skipping 19 matching lines @@
     user_prefs::PrefRegistrySyncable* registry) {
   // Indicates whether app shortcuts have been created.
   registry->RegisterBooleanPref(
       prefs::kAppShortcutsHaveBeenCreated, false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 AppShortcutManager::AppShortcutManager(Profile* profile)
     : profile_(profile),
       is_profile_info_cache_observer_(false),
-      prefs_(profile->GetPrefs()) {
+      prefs_(profile->GetPrefs()),
+      extension_registry_observer_(this) {
   // Use of g_browser_process requires that we are either on the UI thread, or
   // there are no threads initialized (such as in unit tests).
   DCHECK(!content::BrowserThread::IsThreadInitialized(
              content::BrowserThread::UI) ||
          content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  registrar_.Add(this,
-                 chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED,
-                 content::Source<Profile>(profile_));
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
-                 content::Source<Profile>(profile_));
+  extension_registry_observer_.Add(
+      extensions::ExtensionRegistry::Get(profile_));
   // Wait for extensions to be ready before running OnceOffCreateShortcuts.
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSIONS_READY,

[not at google - send to devlin, 2014/05/27 17:40:16]

Incidentally you should be able to get rid of this notification like:

ExtensionSystem::Get(profile)->ready()->Post(
    FROM_HERE,
    base::Bind(weak_ptr_factory_.GetWeakPtr(),
               &AppShortcutManager::OnceOffCreateShortcuts));

not in this CL though :) would require adding a WeakPtrFactory too.

[limasdf, 2014/05/27 17:54:07]

Thank you for let me know that. :) I'll do it in seperate CL.

                  content::Source<Profile>(profile_));
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   // profile_manager might be NULL in testing environments.
   if (profile_manager) {
     profile_manager->GetProfileInfoCache().AddObserver(this);
     is_profile_info_cache_observer_ = true;
   }
 }
 
 AppShortcutManager::~AppShortcutManager() {
   if (g_browser_process && is_profile_info_cache_observer_) {
     ProfileManager* profile_manager = g_browser_process->profile_manager();
     // profile_manager might be NULL in testing environments or during shutdown.
     if (profile_manager)
       profile_manager->GetProfileInfoCache().RemoveObserver(this);
   }
 }
 
 void AppShortcutManager::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
-  switch (type) {
-    case chrome::NOTIFICATION_EXTENSIONS_READY: {
-      OnceOffCreateShortcuts();
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_INSTALLED_DEPRECATED: {
-      const extensions::InstalledExtensionInfo* installed_info =
-          content::Details<const extensions::InstalledExtensionInfo>(details)
-              .ptr();
-      const Extension* extension = installed_info->extension;
-      // If the app is being updated, update any existing shortcuts but do not
-      // create new ones. If it is being installed, automatically create a
-      // shortcut in the applications menu (e.g., Start Menu).
-      if (installed_info->is_update) {
-        web_app::UpdateAllShortcuts(
-            base::UTF8ToUTF16(installed_info->old_name), profile_, extension);
-      } else if (ShouldCreateShortcutFor(profile_, extension)) {
-        CreateShortcutsInApplicationsMenu(profile_, extension);
-      }
-      break;
-    }
-    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED: {
-      const Extension* extension = content::Details<const Extension>(
-          details).ptr();
-      web_app::DeleteAllShortcuts(profile_, extension);
-      break;
-    }
-    default:
-      NOTREACHED();
+  DCHECK_EQ(chrome::NOTIFICATION_EXTENSIONS_READY, type);
+  OnceOffCreateShortcuts();
+}
+
+void AppShortcutManager::OnExtensionWillBeInstalled(
+    content::BrowserContext* browser_context,
+    const Extension* extension,
+    bool is_update,
+    const std::string& old_name) {
+  // If the app is being updated, update any existing shortcuts but do not
+  // create new ones. If it is being installed, automatically create a
+  // shortcut in the applications menu (e.g., Start Menu).
+  if (is_update) {
+    web_app::UpdateAllShortcuts(
+        base::UTF8ToUTF16(old_name), profile_, extension);
+  } else if (ShouldCreateShortcutFor(profile_, extension)) {
+    CreateShortcutsInApplicationsMenu(profile_, extension);
   }
 }
 
+void AppShortcutManager::OnExtensionUninstalled(
+    content::BrowserContext* browser_context,
+    const Extension* extension) {
+  web_app::DeleteAllShortcuts(profile_, extension);
+}
+
 void AppShortcutManager::OnProfileWillBeRemoved(
     const base::FilePath& profile_path) {
   if (profile_path != profile_->GetPath())
     return;
   content::BrowserThread::PostTask(
       content::BrowserThread::FILE, FROM_HERE,
       base::Bind(&web_app::internals::DeleteAllShortcutsForProfile,
                  profile_path));
 }
 
@@ skipping 12 matching lines @@
     return;
 
   // Create an applications menu shortcut for each app in this profile.
   const extensions::ExtensionSet* apps = extension_service->extensions();
   for (extensions::ExtensionSet::const_iterator it = apps->begin();
        it != apps->end(); ++it) {
     if (ShouldCreateShortcutFor(profile_, it->get()))
       CreateShortcutsInApplicationsMenu(profile_, it->get());
   }
 }