Remove chrome/ code to handle App Notifications

chrome/browser/extensions/extension_service.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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 
@@ skipping 17 matching lines @@
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/api/app_runtime/app_runtime_api.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/api/storage/settings_frontend.h"
-#include "chrome/browser/extensions/app_notification_manager.h"
 #include "chrome/browser/extensions/app_sync_data.h"
 #include "chrome/browser/extensions/browser_event_router.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/data_deleter.h"
 #include "chrome/browser/extensions/extension_disabled_ui.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_error_ui.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
@@ skipping 292 matching lines @@
       blacklist_(blacklist),
       settings_frontend_(extensions::SettingsFrontend::Create(profile)),
       pending_extension_manager_(*ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       install_directory_(install_directory),
       extensions_enabled_(extensions_enabled),
       show_extensions_prompts_(true),
       install_updates_when_idle_(true),
       ready_(false),
       toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       menu_manager_(profile),
-      app_notification_manager_(
-          new extensions::AppNotificationManager(profile)),
       event_routers_initialized_(false),
       update_once_all_providers_are_ready_(false),
       browser_terminating_(false),
       installs_delayed_(false),
       wipeout_is_active_(false),
       wipeout_count_(0u),
       app_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       extension_sync_bundle_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 37 matching lines @@
                                                     profile,
                                                     blacklist,
                                                     update_frequency));
   }
 
   component_loader_.reset(
       new extensions::ComponentLoader(this,
                                       profile->GetPrefs(),
                                       g_browser_process->local_state()));
 
-  app_notification_manager_->Init();
-
   if (extensions_enabled_) {
     CHECK(!ProfileManager::IsImportProcess(*command_line));
     extensions::ExternalProviderImpl::CreateExternalProviders(
         this, profile_, &external_extension_providers_);
   }
 
   // Set this as the ExtensionService for extension sorting to ensure it
   // cause syncs if required.
   extension_prefs_->extension_sorting()->SetExtensionService(this);
 
@@ skipping 962 matching lines @@
                                        IsExtensionEnabled(extension.id()),
                                        IsIncognitoEnabled(extension.id()));
 }
 
 extensions::AppSyncData ExtensionService::GetAppSyncData(
     const Extension& extension) const {
   return extensions::AppSyncData(
       extension,
       IsExtensionEnabled(extension.id()),
       IsIncognitoEnabled(extension.id()),
-      extension_prefs_->GetAppNotificationClientId(extension.id()),
-      extension_prefs_->IsAppNotificationDisabled(extension.id()),
       extension_prefs_->extension_sorting()->GetAppLaunchOrdinal(
           extension.id()),
       extension_prefs_->extension_sorting()->GetPageOrdinal(extension.id()));
 }
 
 std::vector<extensions::ExtensionSyncData>
   ExtensionService::GetExtensionSyncDataList() const {
   std::vector<extensions::ExtensionSyncData> extension_sync_list;
   extension_sync_bundle_.GetExtensionSyncDataListHelper(extensions_,
                                                         &extension_sync_list);
@@ skipping 38 matching lines @@
     CheckForUpdatesSoon();
     return false;
   }
 
   return true;
 }
 
 bool ExtensionService::ProcessAppSyncData(
     const extensions::AppSyncData& app_sync_data) {
   const std::string& id = app_sync_data.id();
-  const Extension* extension = GetInstalledExtension(id);
-  bool extension_installed = (extension != NULL);
 
   if (app_sync_data.app_launch_ordinal().IsValid() &&
       app_sync_data.page_ordinal().IsValid()) {
     extension_prefs_->extension_sorting()->SetAppLaunchOrdinal(
         id,
         app_sync_data.app_launch_ordinal());
     extension_prefs_->extension_sorting()->SetPageOrdinal(
         id,
         app_sync_data.page_ordinal());
   }
 
-  if (extension_installed) {
-    if (app_sync_data.notifications_disabled() !=
-        extension_prefs_->IsAppNotificationDisabled(id)) {
-      extension_prefs_->SetAppNotificationDisabled(
-          id, app_sync_data.notifications_disabled());
-    }
-  }
-
   if (!ProcessExtensionSyncDataHelper(app_sync_data.extension_sync_data(),
                                       syncer::APPS)) {
     app_sync_bundle_.AddPendingApp(id, app_sync_data);
     CheckForUpdatesSoon();
     return false;
   }
 
   return true;
 }
 
@@ skipping 140 matching lines @@
   std::string id = extension_id;
   if (extension_is_enabled)
     ReloadExtension(id);
 
   // Reloading the extension invalidates the |extension| pointer.
   extension = GetInstalledExtension(id);
   if (extension)
     SyncExtensionChangeIfNeeded(*extension);
 }
 
-void ExtensionService::SetAppNotificationSetupDone(
-    const std::string& extension_id,
-    const std::string& oauth_client_id) {
-  const Extension* extension = GetInstalledExtension(extension_id);
-  // This method is called when the user sets up app notifications.
-  // So it is not expected to be called until the extension is installed.
-  if (!extension) {
-    NOTREACHED();
-    return;
-  }
-  extension_prefs_->SetAppNotificationClientId(extension_id, oauth_client_id);
-  SyncExtensionChangeIfNeeded(*extension);
-}
-
-void ExtensionService::SetAppNotificationDisabled(
-    const std::string& extension_id,
-    bool value) {
-  const Extension* extension = GetInstalledExtension(extension_id);
-  // This method is called when the user enables/disables app notifications.
-  // So it is not expected to be called until the extension is installed.
-  if (!extension) {
-    NOTREACHED();
-    return;
-  }
-  if (value)
-    UMA_HISTOGRAM_COUNTS("Apps.SetAppNotificationsDisabled", 1);
-  else
-    UMA_HISTOGRAM_COUNTS("Apps.SetAppNotificationsEnabled", 1);

[not at google - send to devlin, 2013/03/08 23:44:10]

need to remember to remove this UMA.

-  extension_prefs_->SetAppNotificationDisabled(extension_id, value);
-  SyncExtensionChangeIfNeeded(*extension);
-}
-
 bool ExtensionService::CanCrossIncognito(const Extension* extension) const {
   // We allow the extension to see events and data from another profile iff it
   // uses "spanning" behavior and it has incognito access. "split" mode
   // extensions only see events for a matching profile.
   CHECK(extension);
   return IsIncognitoEnabled(extension->id()) &&
       !extension->incognito_split_mode();
 }
 
 bool ExtensionService::CanLoadInIncognito(const Extension* extension) const {
@@ skipping 1451 matching lines @@
     if (!extension)
       continue;
     blacklisted_extensions_.Insert(extension);
     UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
     UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.BlacklistInstalled",
                               extension->location(), Manifest::NUM_LOCATIONS);
   }
 
   IdentifyAlertableExtensions();
 }