diff options
author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 02:04:22 +0000 |
---|---|---|
committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-08 02:04:22 +0000 |
commit | 5930cb6dacd08ecf46410cd7dd4f96724e353e5f (patch) | |
tree | 372cf2f78441a70355efb20571ca80c6bc6ec201 | |
parent | 969f815e00942ba68f6ddd7bf4b0ce9f6da9479c (diff) | |
download | chromium_src-5930cb6dacd08ecf46410cd7dd4f96724e353e5f.zip chromium_src-5930cb6dacd08ecf46410cd7dd4f96724e353e5f.tar.gz chromium_src-5930cb6dacd08ecf46410cd7dd4f96724e353e5f.tar.bz2 |
printing: replace the deprecated macro (DISALLOW_EVIL_CONSTRUCTORS).
Use DISALLOW_COPY_AND_ASSIGN instead.
Patch contributed by Thiago Farina
Review URL: http://codereview.chromium.org/460087
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34030 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/printing/print_job_manager.h | 2 | ||||
-rw-r--r-- | chrome/browser/printing/print_job_worker.h | 2 | ||||
-rw-r--r-- | printing/emf_win.h | 4 | ||||
-rw-r--r-- | printing/image.cc | 2 | ||||
-rw-r--r-- | printing/printed_document.h | 4 | ||||
-rw-r--r-- | printing/printed_page.h | 2 | ||||
-rw-r--r-- | printing/printing_context.h | 2 | ||||
-rw-r--r-- | printing/printing_context_win.cc | 7 |
8 files changed, 12 insertions, 13 deletions
diff --git a/chrome/browser/printing/print_job_manager.h b/chrome/browser/printing/print_job_manager.h index ec5febb..2bfe2e5 100644 --- a/chrome/browser/printing/print_job_manager.h +++ b/chrome/browser/printing/print_job_manager.h @@ -60,7 +60,7 @@ class PrintJobManager : public NotificationObserver { // Current print jobs that are active. PrintJobs current_jobs_; - DISALLOW_EVIL_CONSTRUCTORS(PrintJobManager); + DISALLOW_COPY_AND_ASSIGN(PrintJobManager); }; } // namespace printing diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h index 56e7893..15f16da 100644 --- a/chrome/browser/printing/print_job_worker.h +++ b/chrome/browser/printing/print_job_worker.h @@ -103,7 +103,7 @@ class PrintJobWorker : public base::Thread { // Current page number to print. PageNumber page_number_; - DISALLOW_EVIL_CONSTRUCTORS(PrintJobWorker); + DISALLOW_COPY_AND_ASSIGN(PrintJobWorker); }; } // namespace printing diff --git a/printing/emf_win.h b/printing/emf_win.h index 4170e87..7a21b1b 100644 --- a/printing/emf_win.h +++ b/printing/emf_win.h @@ -103,7 +103,7 @@ class Emf { // Valid when generating EMF data through a virtual HDC. HDC hdc_; - DISALLOW_EVIL_CONSTRUCTORS(Emf); + DISALLOW_COPY_AND_ASSIGN(Emf); }; struct Emf::EnumerationContext { @@ -173,7 +173,7 @@ class Emf::Enumerator { EnumerationContext context_; - DISALLOW_EVIL_CONSTRUCTORS(Enumerator); + DISALLOW_COPY_AND_ASSIGN(Enumerator); }; } // namespace printing diff --git a/printing/image.cc b/printing/image.cc index ba52567..9ead5e0 100644 --- a/printing/image.cc +++ b/printing/image.cc @@ -53,7 +53,7 @@ class DisableFontSmoothing { private: bool enable_again_; - DISALLOW_EVIL_CONSTRUCTORS(DisableFontSmoothing); + DISALLOW_COPY_AND_ASSIGN(DisableFontSmoothing); }; } // namespace diff --git a/printing/printed_document.h b/printing/printed_document.h index c7d806c..77364f9 100644 --- a/printing/printed_document.h +++ b/printing/printed_document.h @@ -115,7 +115,7 @@ class PrintedDocument : public base::RefCountedThreadSafe<PrintedDocument> { // Contains all the mutable stuff. All this stuff MUST be accessed with the // lock held. struct Mutable { - Mutable(PrintedPagesSource* source); + explicit Mutable(PrintedPagesSource* source); // Source that generates the PrintedPage's (i.e. a TabContents). It will be // set back to NULL if the source is deleted before this object. @@ -190,7 +190,7 @@ class PrintedDocument : public base::RefCountedThreadSafe<PrintedDocument> { // All the immutable members. const Immutable immutable_; - DISALLOW_EVIL_CONSTRUCTORS(PrintedDocument); + DISALLOW_COPY_AND_ASSIGN(PrintedDocument); }; } // namespace printing diff --git a/printing/printed_page.h b/printing/printed_page.h index 101be9a..cbc9e01 100644 --- a/printing/printed_page.h +++ b/printing/printed_page.h @@ -45,7 +45,7 @@ class PrintedPage : public base::RefCountedThreadSafe<PrintedPage> { // job. const gfx::Size page_size_; - DISALLOW_EVIL_CONSTRUCTORS(PrintedPage); + DISALLOW_COPY_AND_ASSIGN(PrintedPage); }; } // namespace printing diff --git a/printing/printing_context.h b/printing/printing_context.h index d1bfca7..29c9478 100644 --- a/printing/printing_context.h +++ b/printing/printing_context.h @@ -168,7 +168,7 @@ class PrintingContext { // Did the user cancel the print job. volatile bool abort_printing_; - DISALLOW_EVIL_CONSTRUCTORS(PrintingContext); + DISALLOW_COPY_AND_ASSIGN(PrintingContext); }; } // namespace printing diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 6c49da2..2142b0f 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -35,9 +35,8 @@ void GetPrinterHelper(HANDLE printer, int level, scoped_array<uint8>* buffer) { namespace printing { -class PrintingContext::CallbackHandler - : public IPrintDialogCallback, - public IObjectWithSite { +class PrintingContext::CallbackHandler : public IPrintDialogCallback, + public IObjectWithSite { public: CallbackHandler(PrintingContext& owner, HWND owner_hwnd) : owner_(owner), @@ -134,7 +133,7 @@ class PrintingContext::CallbackHandler HWND owner_hwnd_; IPrintDialogServices* services_; - DISALLOW_EVIL_CONSTRUCTORS(CallbackHandler); + DISALLOW_COPY_AND_ASSIGN(CallbackHandler); }; PrintingContext::PrintingContext() |