Revert 86724 - Modifying the BackgroundModeManager to handle multiple profiles.

chrome/browser/background_application_list_model.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/background_application_list_model.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/stl_util-inl.h"
@@ skipping 78 matching lines @@
 
 bool HasBackgroundAppPermission(
     const std::set<std::string>& api_permissions) {
   return Extension::HasApiPermission(
       api_permissions, Extension::kBackgroundPermission);
 }
 }  // namespace
 
 void
 BackgroundApplicationListModel::Observer::OnApplicationDataChanged(
-    const Extension* extension, Profile* profile) {
+    const Extension* extension) {
 }
 
 void
-BackgroundApplicationListModel::Observer::OnApplicationListChanged(
-    Profile* profile) {
+BackgroundApplicationListModel::Observer::OnApplicationListChanged() {
 }
 
 BackgroundApplicationListModel::Observer::~Observer() {
 }
 
 BackgroundApplicationListModel::Application::~Application() {
 }
 
 BackgroundApplicationListModel::Application::Application(
     BackgroundApplicationListModel* model,
     const Extension* extension)
     : extension_(extension),
       icon_(NULL),
       model_(model),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)) {
 }
 
 void BackgroundApplicationListModel::Application::OnImageLoaded(
     SkBitmap* image,
     const ExtensionResource& resource,
     int index) {
   if (!image)
     return;
   icon_.reset(new SkBitmap(*image));
-  model_->SendApplicationDataChangedNotifications(extension_);
+  model_->OnApplicationDataChanged(extension_);
 }
 
 void BackgroundApplicationListModel::Application::RequestIcon(
     Extension::Icons size) {
   ExtensionResource resource = extension_->GetIconResource(
       size, ExtensionIconSet::MATCH_BIGGER);
   tracker_.LoadImage(extension_, resource, gfx::Size(size, size),
                      ImageLoadingTracker::CACHE);
 }
 
@@ skipping 117 matching lines @@
       OnExtensionLoaded(Details<Extension>(details).ptr());
       break;
     case NotificationType::EXTENSION_UNLOADED:
       OnExtensionUnloaded(Details<UnloadedExtensionInfo>(details)->extension);
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }
 
-void BackgroundApplicationListModel::SendApplicationDataChangedNotifications(
+void BackgroundApplicationListModel::OnApplicationDataChanged(
     const Extension* extension) {
-  FOR_EACH_OBSERVER(Observer, observers_, OnApplicationDataChanged(extension,
-                                                                   profile_));
+  FOR_EACH_OBSERVER(Observer, observers_, OnApplicationDataChanged(extension));
 }
 
 void BackgroundApplicationListModel::OnExtensionLoaded(Extension* extension) {
   // We only care about extensions that are background applications
   if (!IsBackgroundApp(*extension))
     return;
   AssociateApplicationData(extension);
   Update();
 }
 
@@ skipping 24 matching lines @@
   ExtensionList::const_iterator new_cursor = extensions.begin();
   while (old_cursor != extensions_.end() &&
          new_cursor != extensions.end() &&
          (*old_cursor)->name() == (*new_cursor)->name() &&
          (*old_cursor)->id() == (*new_cursor)->id()) {
     ++old_cursor;
     ++new_cursor;
   }
   if (old_cursor != extensions_.end() || new_cursor != extensions.end()) {
     extensions_ = extensions;
-    FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged(profile_));
+    FOR_EACH_OBSERVER(Observer, observers_, OnApplicationListChanged());
   }
 }