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

chrome/browser/notifications/notification_ui_manager.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/notifications/notification_ui_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/fullscreen.h"
 #include "chrome/browser/idle.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/site_instance.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace {
 const int kUserStatePollingIntervalSeconds = 1;
 }
 
 // A class which represents a notification waiting to be shown.
 class QueuedNotification {
  public:
   QueuedNotification(const Notification& notification, Profile* profile)
       : notification_(notification),
@@ skipping 14 matching lines @@
   // Non owned pointer to the user's profile.
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(QueuedNotification);
 };
 
 NotificationUIManager::NotificationUIManager(PrefService* local_state)
     : balloon_collection_(NULL),
       is_user_active_(true) {
   registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   position_pref_.Init(prefs::kDesktopNotificationPosition, local_state, this);
 #if defined(OS_MACOSX)
   InitFullScreenMonitor();
 #endif
 }
 
 NotificationUIManager::~NotificationUIManager() {
   STLDeleteElements(&show_queue_);
 #if defined(OS_MACOSX)
   StopFullScreenMonitor();
@@ skipping 184 matching lines @@
   } else if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* name = content::Details<std::string>(details).ptr();
     if (*name == prefs::kDesktopNotificationPosition)
       balloon_collection_->SetPositionPreference(
           static_cast<BalloonCollection::PositionPreference>(
               position_pref_.GetValue()));
   } else {
     NOTREACHED();
   }
 }