summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing/print_view_manager.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-19 02:52:53 +0000
commit6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch)
treea75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/printing/print_view_manager.cc
parentbf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff)
downloadchromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz
chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header. BUG=98716 TBR=joi git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_view_manager.cc')
-rw-r--r--chrome/browser/printing/print_view_manager.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index 6ffab8e..45f0700 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -19,9 +19,9 @@
#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_details.h"
#include "content/common/notification_service.h"
-#include "content/common/notification_source.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"
@@ -238,7 +238,7 @@ void PrintViewManager::OnPrintingFailed(int cookie) {
NotificationService::current()->Notify(
chrome::NOTIFICATION_PRINT_JOB_RELEASED,
- Source<TabContents>(tab_contents()),
+ content::Source<TabContents>(tab_contents()),
NotificationService::NoDetails());
}
@@ -258,11 +258,11 @@ bool PrintViewManager::OnMessageReceived(const IPC::Message& message) {
}
void PrintViewManager::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
switch (type) {
case chrome::NOTIFICATION_PRINT_JOB_EVENT: {
- OnNotifyPrintJobEvent(*Details<JobEventDetails>(details).ptr());
+ OnNotifyPrintJobEvent(*content::Details<JobEventDetails>(details).ptr());
break;
}
default: {
@@ -280,7 +280,7 @@ void PrintViewManager::OnNotifyPrintJobEvent(
NotificationService::current()->Notify(
chrome::NOTIFICATION_PRINT_JOB_RELEASED,
- Source<TabContentsWrapper>(tab_),
+ content::Source<TabContentsWrapper>(tab_),
NotificationService::NoDetails());
break;
}
@@ -310,7 +310,7 @@ void PrintViewManager::OnNotifyPrintJobEvent(
NotificationService::current()->Notify(
chrome::NOTIFICATION_PRINT_JOB_RELEASED,
- Source<TabContentsWrapper>(tab_),
+ content::Source<TabContentsWrapper>(tab_),
NotificationService::NoDetails());
break;
}
@@ -392,7 +392,7 @@ bool PrintViewManager::CreateNewPrintJob(PrintJobWorkerOwner* job) {
print_job_ = new PrintJob();
print_job_->Initialize(job, this, number_pages_);
registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
- Source<PrintJob>(print_job_.get()));
+ content::Source<PrintJob>(print_job_.get()));
printing_succeeded_ = false;
return true;
}
@@ -452,7 +452,7 @@ void PrintViewManager::ReleasePrintJob() {
PrintingDone(printing_succeeded_);
registrar_.Remove(this, chrome::NOTIFICATION_PRINT_JOB_EVENT,
- Source<PrintJob>(print_job_.get()));
+ content::Source<PrintJob>(print_job_.get()));
print_job_->DisconnectSource();
// Don't close the worker thread.
print_job_ = NULL;