Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

 // Copyright (c) 2011 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 <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/disposition_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
-#include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/animation/animation.h"
 #include "webkit/glue/window_open_disposition.h"
 
 namespace {
 
 // The URL prefixes used by the NTP to signal when the web store or an app
@@ skipping 156 matching lines @@
   web_ui_->RegisterMessageCallback("reorderApps",
       NewCallback(this, &AppLauncherHandler::HandleReorderApps));
   web_ui_->RegisterMessageCallback("setPageIndex",
       NewCallback(this, &AppLauncherHandler::HandleSetPageIndex));
   web_ui_->RegisterMessageCallback("promoSeen",
       NewCallback(this, &AppLauncherHandler::HandlePromoSeen));
   web_ui_->RegisterMessageCallback("saveAppPageName",
       NewCallback(this, &AppLauncherHandler::HandleSaveAppPageName));
 }
 
-void AppLauncherHandler::Observe(NotificationType type,
+void AppLauncherHandler::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   if (ignore_changes_)
     return;
 
-  switch (type.value) {
-    case NotificationType::APP_NOTIFICATION_STATE_CHANGED: {
+  switch (type) {
+    case chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED: {
       const std::string& id = *Details<const std::string>(details).ptr();
       const AppNotification* notification =
           extensions_service_->app_notification_manager()->GetLast(id);
       ListValue args;
       args.Append(new StringValue(id));
       if (notification)
         args.Append(SerializeNotification(*notification));
       web_ui_->CallJavascriptFunction("appNotificationChanged", args);
       break;
     }
-    case NotificationType::EXTENSION_LOADED:
-    case NotificationType::EXTENSION_UNLOADED: {
+    case chrome::NOTIFICATION_EXTENSION_LOADED:
+    case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* extension =
-          type == NotificationType::EXTENSION_LOADED ?
+          type == chrome::NOTIFICATION_EXTENSION_LOADED ?
               Details<const Extension>(details).ptr() :
               Details<UnloadedExtensionInfo>(details)->extension;
       if (!extension->is_app())
         break;
 
       if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
         scoped_ptr<DictionaryValue> app_info(GetAppInfo(extension));
         std::string function =
-            type.value == NotificationType::EXTENSION_LOADED ?
+            type == chrome::NOTIFICATION_EXTENSION_LOADED ?
                 "ntp4.appAdded" : "ntp4.appRemoved";
         web_ui_->CallJavascriptFunction(function, *app_info);
       } else if (web_ui_->tab_contents()) {
         HandleGetApps(NULL);
       }
 
       break;
     }
-    case NotificationType::EXTENSION_LAUNCHER_REORDERED:
+    case chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED:
     // The promo may not load until a couple seconds after the first NTP view,
     // so we listen for the load notification and notify the NTP when ready.
-    case NotificationType::WEB_STORE_PROMO_LOADED:
+    case chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED:
       if (web_ui_->tab_contents())
         HandleGetApps(NULL);
       break;
-    case NotificationType::PREF_CHANGED: {
+    case chrome::NOTIFICATION_PREF_CHANGED: {
       if (!web_ui_->tab_contents())
         break;
       // Handle app page renames.
       std::string* pref_name = Details<std::string>(details).ptr();
       if (*pref_name == prefs::kNTPAppPageNames) {
         HandleGetApps(NULL);
       } else {
         // Default prefs change handling.
         DictionaryValue dictionary;
         FillAppDictionary(&dictionary);
@@ skipping 118 matching lines @@
     ignore_changes_ = false;
     ShownSectionsHandler::SetShownSection(prefs, THUMB);
   }
 
   FillAppDictionary(&dictionary);
   web_ui_->CallJavascriptFunction("getAppsCallback", dictionary);
 
   // First time we get here we set up the observer so that we can tell update
   // the apps as they change.
   if (registrar_.IsEmpty()) {
-    registrar_.Add(this, NotificationType::APP_NOTIFICATION_STATE_CHANGED,
+    registrar_.Add(this, chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED,
         NotificationService::AllSources());
-    registrar_.Add(this, NotificationType::EXTENSION_LOADED,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
         NotificationService::AllSources());
-    registrar_.Add(this, NotificationType::EXTENSION_UNLOADED,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
         NotificationService::AllSources());
-    registrar_.Add(this, NotificationType::EXTENSION_LAUNCHER_REORDERED,
+    registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
         NotificationService::AllSources());
-    registrar_.Add(this, NotificationType::WEB_STORE_PROMO_LOADED,
+    registrar_.Add(this, chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED,
         NotificationService::AllSources());
   }
   if (pref_change_registrar_.IsEmpty()) {
     pref_change_registrar_.Init(
         extensions_service_->extension_prefs()->pref_service());
     pref_change_registrar_.Add(ExtensionPrefs::kExtensionsPref, this);
     pref_change_registrar_.Add(prefs::kNTPAppPageNames, this);
   }
 }
 
@@ skipping 350 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extensions_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extensions_service_->GetExtensionById(*iter, true))
       extensions_service_->UninstallExtension(*iter, false, NULL);
   }
 }