Moved the AppNotification system into extensions namespace

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 <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/field_trial.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/app_notification.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 55 matching lines @@
       ignore_changes_(false),
       attempted_bookmark_app_install_(false),
       has_loaded_apps_(false) {
 }
 
 AppLauncherHandler::~AppLauncherHandler() {}
 
 // Serializes |notification| into a new DictionaryValue which the caller then
 // owns.
 static DictionaryValue* SerializeNotification(
-    const AppNotification& notification) {
+    const extensions::AppNotification& notification) {
   DictionaryValue* dictionary = new DictionaryValue();
   dictionary->SetString("title", notification.title());
   dictionary->SetString("body", notification.body());
   if (!notification.link_url().is_empty()) {
     dictionary->SetString("linkUrl", notification.link_url().spec());
     dictionary->SetString("linkText", notification.link_text());
   }
   return dictionary;
 }
 
-void AppLauncherHandler::CreateAppInfo(const Extension* extension,
-                                       const AppNotification* notification,
-                                       ExtensionService* service,
-                                       DictionaryValue* value) {
+void AppLauncherHandler::CreateAppInfo(
+    const Extension* extension,
+    const extensions::AppNotification* notification,
+    ExtensionService* service,
+    DictionaryValue* value) {
   value->Clear();
 
   // The Extension class 'helpfully' wraps bidi control characters that
   // impede our ability to determine directionality.
   string16 name = UTF8ToUTF16(extension->name());
   base::i18n::UnadjustStringForLocaleDirection(&name);
   NewTabUI::SetURLTitleAndDirection(value, name, extension->GetFullLaunchURL());
 
   bool enabled = service->IsExtensionEnabled(extension->id()) &&
       !service->GetTerminatedExtension(extension->id());
@@ skipping 121 matching lines @@
     return;
   }
 
   if (ignore_changes_ || !has_loaded_apps_)
     return;
 
   switch (type) {
     case chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED: {
       const std::string& id =
           *content::Details<const std::string>(details).ptr();
-      const AppNotification* notification =
+      const extensions::AppNotification* notification =
           extension_service_->app_notification_manager()->GetLast(id);
       base::StringValue id_value(id);
       if (notification) {
         scoped_ptr<DictionaryValue> notification_value(
             SerializeNotification(*notification));
         web_ui()->CallJavascriptFunction("ntp.appNotificationChanged",
             id_value, *notification_value.get());
       } else {
         web_ui()->CallJavascriptFunction("ntp.appNotificationChanged",
                                          id_value);
@@ skipping 136 matching lines @@
         l10n_util::GetStringUTF16(IDS_APP_DEFAULT_PAGE_NAME)));
     dictionary->Set("appPageNames",
                     static_cast<ListValue*>(list->DeepCopy()));
   } else {
     dictionary->Set("appPageNames",
                     static_cast<ListValue*>(app_page_names->DeepCopy()));
   }
 }
 
 DictionaryValue* AppLauncherHandler::GetAppInfo(const Extension* extension) {
-  AppNotificationManager* notification_manager =
+  extensions::AppNotificationManager* notification_manager =
       extension_service_->app_notification_manager();
   DictionaryValue* app_info = new DictionaryValue();
   // CreateAppInfo can change the extension prefs.
   AutoReset<bool> auto_reset(&ignore_changes_, true);
   CreateAppInfo(extension,
                 notification_manager->GetLast(extension->id()),
                 extension_service_,
                 app_info);
   return app_info;
 }
@@ skipping 346 matching lines @@
   std::string extension_id;
   CHECK(args->GetString(0, &extension_id));
 
   const Extension* extension = extension_service_->GetExtensionById(
       extension_id, true);
   if (!extension)
     return;
 
   UMA_HISTOGRAM_COUNTS("AppNotification.NTPNotificationClosed", 1);
 
-  AppNotificationManager* notification_manager =
+  extensions::AppNotificationManager* notification_manager =
       extension_service_->app_notification_manager();
   notification_manager->ClearAll(extension_id);
 }
 
 void AppLauncherHandler::HandleSetNotificationsDisabled(
     const ListValue* args) {
   std::string extension_id;
   bool disabled = false;
   CHECK(args->GetString(0, &extension_id));
   CHECK(args->GetBoolean(1, &disabled));
@@ skipping 208 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const extensions::ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (extensions::ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }