Move extension notifications to extensions/browser/notification_types.h

chrome/browser/ui/webui/ntp/app_launcher_handler.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/ui/webui/ntp/app_launcher_handler.h"
 
 #include <vector>
 
 #include "apps/metrics_names.h"
 #include "base/auto_reset.h"
@@ skipping 236 matching lines @@
     highlight_app_id_ = *content::Details<const std::string>(details).ptr();
     if (has_loaded_apps_)
       SetAppToBeHighlighted();
     return;
   }
 
   if (ignore_changes_ || !has_loaded_apps_)
     return;
 
   switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
+    case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED: {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
       if (!extension->is_app())
         return;
 
       if (!extensions::ui_util::ShouldDisplayInNewTabPage(
               extension, Profile::FromWebUI(web_ui()))) {
         return;
       }
 
       scoped_ptr<base::DictionaryValue> app_info(GetAppInfo(extension));
       if (app_info.get()) {
         visible_apps_.insert(extension->id());
 
         ExtensionPrefs* prefs =
             ExtensionPrefs::Get(extension_service_->profile());
         base::FundamentalValue highlight(
             prefs->IsFromBookmark(extension->id()) &&
             attempted_bookmark_app_install_);
         attempted_bookmark_app_install_ = false;
         web_ui()->CallJavascriptFunction("ntp.appAdded", *app_info, highlight);
       }
 
       break;
     }
-    case chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
-    case chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: {
+    case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
+    case extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED: {
       const Extension* extension = NULL;
       bool uninstalled = false;
-      if (type == chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED) {
+      if (type == extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED) {
         extension = content::Details<const Extension>(details).ptr();
         uninstalled = true;
       } else {  // NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED
         if (content::Details<UnloadedExtensionInfo>(details)->reason ==
             UnloadedExtensionInfo::REASON_UNINSTALL) {
           // Uninstalls are tracked by
           // NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED.
           return;
         }
         extension = content::Details<extensions::UnloadedExtensionInfo>(
@@ skipping 14 matching lines @@
           visible_apps_.erase(extension->id());
 
         web_ui()->CallJavascriptFunction(
             "ntp.appRemoved",
             *app_info,
             base::FundamentalValue(uninstalled),
             base::FundamentalValue(!extension_id_prompting_.empty()));
       }
       break;
     }
-    case chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED: {
+    case chrome::NOTIFICATION_APP_LAUNCHER_REORDERED: {
       const std::string* id =
           content::Details<const std::string>(details).ptr();
       if (id) {
         const Extension* extension =
             extension_service_->GetInstalledExtension(*id);
         if (!extension) {
           // Extension could still be downloading or installing.
           return;
         }
 
         base::DictionaryValue app_info;
         CreateAppInfo(extension,
                       extension_service_,
                       &app_info);
         web_ui()->CallJavascriptFunction("ntp.appMoved", app_info);
       } else {
         HandleGetApps(NULL);
       }
       break;
     }
-    case chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR: {
+    case extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR: {
       CrxInstaller* crx_installer = content::Source<CrxInstaller>(source).ptr();
       if (!Profile::FromWebUI(web_ui())->IsSameProfile(
               crx_installer->profile())) {
         return;
       }
       // Fall through.
     }
-    case chrome::NOTIFICATION_EXTENSION_LOAD_ERROR: {
+    case extensions::NOTIFICATION_EXTENSION_LOAD_ERROR: {
       attempted_bookmark_app_install_ = false;
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void AppLauncherHandler::FillAppDictionary(base::DictionaryValue* dictionary) {
   // CreateAppInfo and ClearOrdinals can change the extension prefs.
@@ skipping 87 matching lines @@
     base::Closure callback = base::Bind(
         &AppLauncherHandler::OnExtensionPreferenceChanged,
         base::Unretained(this));
     extension_pref_change_registrar_.Init(
         ExtensionPrefs::Get(profile)->pref_service());
     extension_pref_change_registrar_.Add(
         extensions::pref_names::kExtensions, callback);
     extension_pref_change_registrar_.Add(prefs::kNtpAppPageNames, callback);
 
     registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
-                   content::Source<Profile>(profile));
-    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
-        content::Source<Profile>(profile));
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
+                   extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
                    content::Source<Profile>(profile));
     registrar_.Add(this,
-                   chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
+                   extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
+                   content::Source<Profile>(profile));
+    registrar_.Add(this,
+                   extensions::NOTIFICATION_EXTENSION_UNINSTALLED_DEPRECATED,
+                   content::Source<Profile>(profile));
+    registrar_.Add(this,
+                   chrome::NOTIFICATION_APP_LAUNCHER_REORDERED,
                    content::Source<AppSorting>(
                        ExtensionPrefs::Get(profile)->app_sorting()));
-    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
-        content::Source<CrxInstaller>(NULL));
-    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOAD_ERROR,
-        content::Source<Profile>(profile));
+    registrar_.Add(this,
+                   extensions::NOTIFICATION_EXTENSION_INSTALL_ERROR,
+                   content::Source<CrxInstaller>(NULL));
+    registrar_.Add(this,
+                   extensions::NOTIFICATION_EXTENSION_LOAD_ERROR,
+                   content::Source<Profile>(profile));
   }
 
   has_loaded_apps_ = true;
 }
 
 void AppLauncherHandler::HandleLaunchApp(const base::ListValue* args) {
   std::string extension_id;
   CHECK(args->GetString(0, &extension_id));
   double source = -1.0;
   CHECK(args->GetDouble(1, &source));
@@ skipping 355 matching lines @@
     Browser* browser = chrome::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_uninstall_dialog_.reset(
         extensions::ExtensionUninstallDialog::Create(
             extension_service_->profile(),
             browser->window()->GetNativeWindow(),
             this));
   }
   return extension_uninstall_dialog_.get();
 }