Remove chrome/ code to handle App Notifications

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 "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/prefs/pref_service.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/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/extensions/management_policy.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 52 matching lines @@
 
 AppLauncherHandler::AppLauncherHandler(ExtensionService* extension_service)
     : extension_service_(extension_service),
       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 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 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());
 
@@ skipping 25 matching lines @@
   value->SetInteger("launch_container", extension->launch_container());
   ExtensionPrefs* prefs = service->extension_prefs();
   value->SetInteger("launch_type",
       prefs->GetLaunchType(extension,
                            ExtensionPrefs::LAUNCH_DEFAULT));
   value->SetBoolean("is_component",
                     extension->location() == extensions::Manifest::COMPONENT);
   value->SetBoolean("is_webstore",
       extension->id() == extension_misc::kWebStoreAppId);
 
-  if (extension->HasAPIPermission(
-        extensions::APIPermission::kAppNotifications)) {
-    value->SetBoolean("notifications_disabled",
-                      prefs->IsAppNotificationDisabled(extension->id()));
-  }
-
-  if (notification)
-    value->Set("notification", SerializeNotification(*notification));
-
   ExtensionSorting* sorting = prefs->extension_sorting();
   syncer::StringOrdinal page_ordinal = sorting->GetPageOrdinal(extension->id());
   if (!page_ordinal.IsValid()) {
     // Make sure every app has a page ordinal (some predate the page ordinal).
     // The webstore app should be on the first page.
     page_ordinal = extension->id() == extension_misc::kWebStoreAppId ?
         sorting->CreateFirstAppPageOrdinal() :
         sorting->GetNaturalAppPageOrdinal();
     sorting->SetPageOrdinal(extension->id(), page_ordinal);
   }
@@ skipping 41 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("saveAppPageName",
       base::Bind(&AppLauncherHandler::HandleSaveAppPageName,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("generateAppForLink",
       base::Bind(&AppLauncherHandler::HandleGenerateAppForLink,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("recordAppLaunchByURL",
       base::Bind(&AppLauncherHandler::HandleRecordAppLaunchByUrl,
                  base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("closeNotification",
-      base::Bind(&AppLauncherHandler::HandleNotificationClose,
-                 base::Unretained(this)));
-  web_ui()->RegisterMessageCallback("setNotificationsDisabled",
-      base::Bind(&AppLauncherHandler::HandleSetNotificationsDisabled,
-                 base::Unretained(this)));
 }
 
 void AppLauncherHandler::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_APP_INSTALLED_TO_NTP) {
     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_APP_NOTIFICATION_STATE_CHANGED: {
-      const std::string& id =
-          *content::Details<const std::string>(details).ptr();
-      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);
-      }
-      break;
-    }
-
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
       if (!extension->is_app())
         return;
 
       scoped_ptr<DictionaryValue> app_info(GetAppInfo(extension));
       if (app_info.get()) {
         visible_apps_.insert(extension->id());
 
@@ skipping 31 matching lines @@
       break;
     }
     case chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED: {
       const std::string* id =
           content::Details<const std::string>(details).ptr();
       if (id) {
         const Extension* extension =
             extension_service_->GetExtensionById(*id, false);
         DictionaryValue app_info;
         CreateAppInfo(extension,
-                      NULL,
                       extension_service_,
                       &app_info);
         web_ui()->CallJavascriptFunction("ntp.appMoved", app_info);
       } else {
         HandleGetApps(NULL);
       }
       break;
     }
     // 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.
@@ skipping 58 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) {
-  extensions::AppNotificationManager* notification_manager =
-      extension_service_->app_notification_manager();
   DictionaryValue* app_info = new DictionaryValue();
   // CreateAppInfo can change the extension prefs.
   base::AutoReset<bool> auto_reset(&ignore_changes_, true);
   CreateAppInfo(extension,
-                notification_manager->GetLast(extension->id()),
                 extension_service_,
                 app_info);
   return app_info;
 }
 
 void AppLauncherHandler::HandleGetApps(const ListValue* args) {
   DictionaryValue dictionary;
 
   // Tell the client whether to show the promo for this view. We don't do this
   // in the case of PREF_CHANGED because:
@@ skipping 35 matching lines @@
   // the apps as they change.
   if (!has_loaded_apps_) {
     base::Closure callback = base::Bind(
         &AppLauncherHandler::OnPreferenceChanged,
         base::Unretained(this));
     pref_change_registrar_.Init(
         extension_service_->extension_prefs()->pref_service());
     pref_change_registrar_.Add(ExtensionPrefs::kExtensionsPref, callback);
     pref_change_registrar_.Add(prefs::kNtpAppPageNames, callback);
 
-    registrar_.Add(this, chrome::NOTIFICATION_APP_NOTIFICATION_STATE_CHANGED,
-        content::Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
         content::Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
         content::Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LAUNCHER_REORDERED,
         content::Source<ExtensionSorting>(
             extension_service_->extension_prefs()->extension_sorting()));
     registrar_.Add(this, chrome::NOTIFICATION_WEB_STORE_PROMO_LOADED,
         content::Source<Profile>(profile));
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR,
@@ skipping 243 matching lines @@
   double source;
   CHECK(args->GetDouble(1, &source));
 
   extension_misc::AppLaunchBucket bucket =
       static_cast<extension_misc::AppLaunchBucket>(static_cast<int>(source));
   CHECK(source < extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
 
   RecordAppLaunchByUrl(Profile::FromWebUI(web_ui()), url, bucket);
 }
 
-void AppLauncherHandler::HandleNotificationClose(const ListValue* args) {
-  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);
-
-  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));
-
-  const Extension* extension = extension_service_->GetExtensionById(
-      extension_id, true);
-  if (!extension)
-    return;
-  extension_service_->SetAppNotificationDisabled(extension_id, disabled);
-}
-
 void AppLauncherHandler::OnFaviconForApp(
     scoped_ptr<AppInstallInfo> install_info,
     const history::FaviconImageResult& image_result) {
   scoped_ptr<WebApplicationInfo> web_app(new WebApplicationInfo());
   web_app->is_bookmark_app = install_info->is_bookmark_app;
   web_app->title = install_info->title;
   web_app->app_url = install_info->app_url;
   web_app->urls.push_back(install_info->app_url);
 
   if (!image_result.image.IsEmpty()) {
@@ skipping 136 matching lines @@
 ExtensionUninstallDialog* AppLauncherHandler::GetExtensionUninstallDialog() {
   if (!extension_uninstall_dialog_.get()) {
     Browser* browser = chrome::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     extension_uninstall_dialog_.reset(
         ExtensionUninstallDialog::Create(extension_service_->profile(),
                                          browser, this));
   }
   return extension_uninstall_dialog_.get();
 }