summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing
diff options
context:
space:
mode:
authordarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-26 05:55:10 +0000
committerdarin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-26 05:55:10 +0000
commitab820df141e6ab45fd8a095d2f57f91df44e6c9c (patch)
tree20ae83601c4a484cd74c908b62bc9d702ef27996 /chrome/browser/printing
parent4d9bdfafcd1393385860bc9fe947e0c07719c0f4 (diff)
downloadchromium_src-ab820df141e6ab45fd8a095d2f57f91df44e6c9c.zip
chromium_src-ab820df141e6ab45fd8a095d2f57f91df44e6c9c.tar.gz
chromium_src-ab820df141e6ab45fd8a095d2f57f91df44e6c9c.tar.bz2
Chrome changes corresponding to my message_loop_type CL.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
-rw-r--r--chrome/browser/printing/print_job_worker.h2
-rw-r--r--chrome/browser/printing/printer_query.h3
-rw-r--r--chrome/browser/printing/printing_layout_uitest.cc6
3 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index 0509a0f..3e25ec5 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -23,7 +23,7 @@ class PrintJobWorkerOwner;
// NOTIFY_PRINT_JOB_EVENT notifications, but they are generated through a
// NotificationTask task to be executed from the right thread, the UI thread.
// PrintJob always outlives its worker instance.
-class PrintJobWorker : public Thread {
+class PrintJobWorker : public base::Thread {
public:
PrintJobWorker(PrintJobWorkerOwner* owner);
~PrintJobWorker();
diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h
index 0cbffbf..d79ac73 100644
--- a/chrome/browser/printing/printer_query.h
+++ b/chrome/browser/printing/printer_query.h
@@ -11,7 +11,10 @@
class CancelableTask;
class MessageLoop;
+
+namespace base {
class Thread;
+}
namespace printing {
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc
index 2151824..30e1c75 100644
--- a/chrome/browser/printing/printing_layout_uitest.cc
+++ b/chrome/browser/printing/printing_layout_uitest.cc
@@ -559,7 +559,8 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) {
tab_proxy->NavigateToURL(url));
- scoped_ptr<Thread> worker(new Thread("PrintingLayoutTest_worker"));
+ scoped_ptr<base::Thread> worker(
+ new base::Thread("PrintingLayoutTest_worker"));
DismissTheWindow dismiss_task(process_util::GetProcId(process()));
// We need to start the thread to be able to set the timer.
worker->Start();
@@ -597,7 +598,8 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) {
EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
tab_proxy->NavigateToURL(url));
- scoped_ptr<Thread> worker(new Thread("PrintingLayoutTest_worker"));
+ scoped_ptr<base::Thread> worker(
+ new base::Thread("PrintingLayoutTest_worker"));
DismissTheWindow dismiss_task(process_util::GetProcId(process()));
// We need to start the thread to be able to set the timer.
worker->Start();