Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/task_manager/task_manager_notification_resource_provider.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/task_manager/task_manager_resource_providers.h"
 
 #include "base/basictypes.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // TaskManagerNotificationResource class
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 76 matching lines @@
   BalloonCollection* collection =
       g_browser_process->notification_ui_manager()->balloon_collection();
   const BalloonCollection::Balloons& balloons = collection->GetActiveBalloons();
   for (BalloonCollection::Balloons::const_iterator it = balloons.begin();
        it != balloons.end(); ++it) {
     AddToTaskManager((*it)->view()->GetHost());
   }
 
   // Register for notifications about extension process changes.
   registrar_.Add(this, chrome::NOTIFICATION_NOTIFY_BALLOON_CONNECTED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 void TaskManagerNotificationResourceProvider::StopUpdating() {
   DCHECK(updating_);
   updating_ = false;
 
   // Unregister for notifications about extension process changes.
   registrar_.Remove(this, chrome::NOTIFICATION_NOTIFY_BALLOON_CONNECTED,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
   registrar_.Remove(this, chrome::NOTIFICATION_NOTIFY_BALLOON_DISCONNECTED,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
 
   // Delete all the resources.
   STLDeleteContainerPairSecondPointers(resources_.begin(), resources_.end());
   resources_.clear();
 }
 
 void TaskManagerNotificationResourceProvider::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ skipping 31 matching lines @@
   // Remove the resource from the Task Manager.
   TaskManagerNotificationResource* resource = iter->second;
   task_manager_->RemoveResource(resource);
 
   // Remove it from the map.
   resources_.erase(iter);
 
   // Finally, delete the resource.
   delete resource;
 }