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

chrome/browser/printing/print_view_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/printing/print_view_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/printing/print_view_manager_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/print_messages.h"
 #include "content/browser/renderer_host/render_view_host.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_details.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "printing/metafile.h"
 #include "printing/metafile_impl.h"
 #include "printing/printed_document.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::TimeDelta;
 
@@ skipping 196 matching lines @@
                     params.actual_shrink,
                     params.page_size,
                     params.content_area);
 
   ShouldQuitFromInnerMessageLoop();
 }
 
 void PrintViewManager::OnPrintingFailed(int cookie) {
   ReleasePrinterQuery(cookie);
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PRINT_JOB_RELEASED,
       content::Source<TabContents>(tab_contents()),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 }
 
 bool PrintViewManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrintViewManager, message)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetPrintedPagesCount,
                         OnDidGetPrintedPagesCount)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetDocumentCookie,
                         OnDidGetDocumentCookie)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidShowPrintDialog, OnDidShowPrintDialog)
@@ skipping 18 matching lines @@
     }
   }
 }
 
 void PrintViewManager::OnNotifyPrintJobEvent(
     const JobEventDetails& event_details) {
   switch (event_details.type()) {
     case JobEventDetails::FAILED: {
       TerminatePrintJob(true);
 
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_PRINT_JOB_RELEASED,
           content::Source<TabContentsWrapper>(tab_),
-          NotificationService::NoDetails());
+          content::NotificationService::NoDetails());
       break;
     }
     case JobEventDetails::USER_INIT_DONE:
     case JobEventDetails::DEFAULT_INIT_DONE:
     case JobEventDetails::USER_INIT_CANCELED: {
       NOTREACHED();
       break;
     }
     case JobEventDetails::ALL_PAGES_REQUESTED: {
       ShouldQuitFromInnerMessageLoop();
       break;
     }
     case JobEventDetails::NEW_DOC:
     case JobEventDetails::NEW_PAGE:
     case JobEventDetails::PAGE_DONE:
     case JobEventDetails::DOC_DONE: {
       // Don't care about the actual printing process.
       break;
     }
     case JobEventDetails::JOB_DONE: {
       // Printing is done, we don't need it anymore.
       // print_job_->is_job_pending() may still be true, depending on the order
       // of object registration.
       printing_succeeded_ = true;
       ReleasePrintJob();
 
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_PRINT_JOB_RELEASED,
           content::Source<TabContentsWrapper>(tab_),
-          NotificationService::NoDetails());
+          content::NotificationService::NoDetails());
       break;
     }
     default: {
       NOTREACHED();
       break;
     }
   }
 }
 
 bool PrintViewManager::RenderAllMissingPagesNow() {
@@ skipping 201 matching lines @@
 }
 
 bool PrintViewManager::PrintNowInternal(IPC::Message* message) {
   // Don't print / print preview interstitials.
   if (tab_contents()->showing_interstitial_page())
     return false;
   return Send(message);
 }
 
 }  // namespace printing