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

chrome/browser/user_style_sheet_watcher.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/user_style_sheet_watcher.h"
 
 #include "base/base64.h"
 #include "base/file_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
 using ::base::files::FilePathWatcher;
 
 namespace {
 
 // The subdirectory of the profile that contains the style sheet.
 const char kStyleSheetDir[] = "User StyleSheets";
 // The filename of the stylesheet.
 const char kUserStyleSheetFile[] = "Custom.css";
@@ skipping 49 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(UserStyleSheetLoader);
 };
 
 UserStyleSheetLoader::UserStyleSheetLoader()
     : has_loaded_(false) {
 }
 
 void UserStyleSheetLoader::NotifyLoaded() {
   if (has_loaded_) {
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_USER_STYLE_SHEET_UPDATED,
         content::Source<UserStyleSheetLoader>(this),
-        NotificationService::NoDetails());
+        content::NotificationService::NoDetails());
   }
 }
 
 void UserStyleSheetLoader::OnFilePathChanged(const FilePath& path) {
   LoadStyleSheet(path);
 }
 
 void UserStyleSheetLoader::LoadStyleSheet(const FilePath& style_sheet_file) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   // We keep the user style sheet in a subdir so we can watch for changes
@@ skipping 34 matching lines @@
 
 UserStyleSheetWatcher::UserStyleSheetWatcher(Profile* profile,
                                              const FilePath& profile_path)
     : profile_(profile),
       profile_path_(profile_path),
       loader_(new UserStyleSheetLoader) {
   // Listen for when the first render view host is created.  If we load
   // too fast, the first tab won't hear the notification and won't get
   // the user style sheet.
   registrar_.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
 
 UserStyleSheetWatcher::~UserStyleSheetWatcher() {
 }
 
 void UserStyleSheetWatcher::Init() {
   // Make sure we run on the file thread.
   if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
     BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(this, &UserStyleSheetWatcher::Init));
@@ skipping 21 matching lines @@
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(type == content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB);
   if (profile_->IsSameProfile(Profile::FromBrowserContext(
           content::Source<TabContents>(source)->browser_context()))) {
     loader_->NotifyLoaded();
     registrar_.RemoveAll();
   }
 }