summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranujk.sharma <anujk.sharma@samsung.com>2014-10-07 00:29:42 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 07:29:54 +0000
commit263c31370ed81377b59ed58b9ae41ded18630c13 (patch)
tree614ab786e8136d1afb9bb7ec87041953d8a23bfa
parent50a41f330c528275c2980d59dbe9d99d8aec2b49 (diff)
downloadchromium_src-263c31370ed81377b59ed58b9ae41ded18630c13.zip
chromium_src-263c31370ed81377b59ed58b9ae41ded18630c13.tar.gz
chromium_src-263c31370ed81377b59ed58b9ae41ded18630c13.tar.bz2
Replacing the OVERRIDE with override and FINAL with final in /src/printing
This step is a giant search and replace for OVERRIDE and FINAL to replace them with their lowercase versions. BUG=417463 Review URL: https://codereview.chromium.org/628133002 Cr-Commit-Position: refs/heads/master@{#298414}
-rw-r--r--printing/emf_win.h26
-rw-r--r--printing/emf_win_unittest.cc4
-rw-r--r--printing/metafile.h2
-rw-r--r--printing/pdf_metafile_cg_mac.h24
-rw-r--r--printing/pdf_metafile_skia.h28
-rw-r--r--printing/printing_context_android.h24
-rw-r--r--printing/printing_context_linux.h24
-rw-r--r--printing/printing_context_mac.h24
-rw-r--r--printing/printing_context_no_system_dialog.h24
-rw-r--r--printing/printing_context_system_dialog_win.h4
-rw-r--r--printing/printing_context_win.h24
-rw-r--r--printing/printing_context_win_unittest.cc6
12 files changed, 107 insertions, 107 deletions
diff --git a/printing/emf_win.h b/printing/emf_win.h
index 579669a..ff1c5a7 100644
--- a/printing/emf_win.h
+++ b/printing/emf_win.h
@@ -54,37 +54,37 @@ class PRINTING_EXPORT Emf : public Metafile {
bool InitFromFile(const base::FilePath& metafile_path);
// Metafile methods.
- virtual bool Init() OVERRIDE;
+ virtual bool Init() override;
virtual bool InitFromData(const void* src_buffer,
- uint32 src_buffer_size) OVERRIDE;
+ uint32 src_buffer_size) override;
virtual SkBaseDevice* StartPageForVectorCanvas(
const gfx::Size& page_size, const gfx::Rect& content_area,
- const float& scale_factor) OVERRIDE;
+ const float& scale_factor) override;
// Inserts a custom GDICOMMENT records indicating StartPage/EndPage calls
// (since StartPage and EndPage do not work in a metafile DC). Only valid
// when hdc_ is non-NULL. |page_size|, |content_area|, and |scale_factor| are
// ignored.
virtual bool StartPage(const gfx::Size& page_size,
const gfx::Rect& content_area,
- const float& scale_factor) OVERRIDE;
- virtual bool FinishPage() OVERRIDE;
- virtual bool FinishDocument() OVERRIDE;
+ const float& scale_factor) override;
+ virtual bool FinishPage() override;
+ virtual bool FinishDocument() override;
- virtual uint32 GetDataSize() const OVERRIDE;
- virtual bool GetData(void* buffer, uint32 size) const OVERRIDE;
+ virtual uint32 GetDataSize() const override;
+ virtual bool GetData(void* buffer, uint32 size) const override;
// Should be passed to Playback to keep the exact same size.
- virtual gfx::Rect GetPageBounds(unsigned int page_number) const OVERRIDE;
+ virtual gfx::Rect GetPageBounds(unsigned int page_number) const override;
- virtual unsigned int GetPageCount() const OVERRIDE { return 1; }
+ virtual unsigned int GetPageCount() const override { return 1; }
- virtual HDC context() const OVERRIDE {
+ virtual HDC context() const override {
return hdc_;
}
- virtual bool Playback(HDC hdc, const RECT* rect) const OVERRIDE;
- virtual bool SafePlayback(HDC hdc) const OVERRIDE;
+ virtual bool Playback(HDC hdc, const RECT* rect) const override;
+ virtual bool SafePlayback(HDC hdc) const override;
HENHMETAFILE emf() const { return emf_; }
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index 451a532..80a7095 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -41,8 +41,8 @@ class EmfPrintingTest : public testing::Test, public PrintingContext::Delegate {
}
// PrintingContext::Delegate methods.
- virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; }
- virtual std::string GetAppLocale() OVERRIDE { return std::string(); }
+ virtual gfx::NativeView GetParentView() override { return NULL; }
+ virtual std::string GetAppLocale() override { return std::string(); }
};
const uint32 EMF_HEADER_SIZE = 128;
diff --git a/printing/metafile.h b/printing/metafile.h
index af0b2372..0078d8b 100644
--- a/printing/metafile.h
+++ b/printing/metafile.h
@@ -163,7 +163,7 @@ class PRINTING_EXPORT Metafile : public MetafilePlayer {
bool GetDataAsVector(std::vector<char>* buffer) const;
- virtual bool SaveTo(base::File* file) const OVERRIDE;
+ virtual bool SaveTo(base::File* file) const override;
private:
DISALLOW_COPY_AND_ASSIGN(Metafile);
diff --git a/printing/pdf_metafile_cg_mac.h b/printing/pdf_metafile_cg_mac.h
index 98c8ea4..c7c1a5a 100644
--- a/printing/pdf_metafile_cg_mac.h
+++ b/printing/pdf_metafile_cg_mac.h
@@ -32,34 +32,34 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile {
virtual ~PdfMetafileCg();
// Metafile methods.
- virtual bool Init() OVERRIDE;
+ virtual bool Init() override;
virtual bool InitFromData(const void* src_buffer,
- uint32 src_buffer_size) OVERRIDE;
+ uint32 src_buffer_size) override;
// Not implemented on mac.
virtual SkBaseDevice* StartPageForVectorCanvas(
const gfx::Size& page_size, const gfx::Rect& content_area,
- const float& scale_factor) OVERRIDE;
+ const float& scale_factor) override;
virtual bool StartPage(const gfx::Size& page_size,
const gfx::Rect& content_area,
- const float& scale_factor) OVERRIDE;
- virtual bool FinishPage() OVERRIDE;
- virtual bool FinishDocument() OVERRIDE;
+ const float& scale_factor) override;
+ virtual bool FinishPage() override;
+ virtual bool FinishDocument() override;
- virtual uint32 GetDataSize() const OVERRIDE;
- virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const OVERRIDE;
+ virtual uint32 GetDataSize() const override;
+ virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const override;
- virtual gfx::Rect GetPageBounds(unsigned int page_number) const OVERRIDE;
- virtual unsigned int GetPageCount() const OVERRIDE;
+ virtual gfx::Rect GetPageBounds(unsigned int page_number) const override;
+ virtual unsigned int GetPageCount() const override;
// Note: The returned context *must not be retained* past Close(). If it is,
// the data returned from GetData will not be valid PDF data.
- virtual CGContextRef context() const OVERRIDE;
+ virtual CGContextRef context() const override;
virtual bool RenderPage(unsigned int page_number,
gfx::NativeDrawingContext context,
const CGRect rect,
- const MacRenderPageParams& params) const OVERRIDE;
+ const MacRenderPageParams& params) const override;
private:
// Returns a CGPDFDocumentRef version of pdf_data_.
diff --git a/printing/pdf_metafile_skia.h b/printing/pdf_metafile_skia.h
index f46fd3c..387ce9a 100644
--- a/printing/pdf_metafile_skia.h
+++ b/printing/pdf_metafile_skia.h
@@ -32,38 +32,38 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile {
virtual ~PdfMetafileSkia();
// Metafile methods.
- virtual bool Init() OVERRIDE;
+ virtual bool Init() override;
virtual bool InitFromData(const void* src_buffer,
- uint32 src_buffer_size) OVERRIDE;
+ uint32 src_buffer_size) override;
virtual SkBaseDevice* StartPageForVectorCanvas(
const gfx::Size& page_size,
const gfx::Rect& content_area,
- const float& scale_factor) OVERRIDE;
+ const float& scale_factor) override;
virtual bool StartPage(const gfx::Size& page_size,
const gfx::Rect& content_area,
- const float& scale_factor) OVERRIDE;
- virtual bool FinishPage() OVERRIDE;
- virtual bool FinishDocument() OVERRIDE;
+ const float& scale_factor) override;
+ virtual bool FinishPage() override;
+ virtual bool FinishDocument() override;
- virtual uint32 GetDataSize() const OVERRIDE;
- virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const OVERRIDE;
+ virtual uint32 GetDataSize() const override;
+ virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const override;
- virtual gfx::Rect GetPageBounds(unsigned int page_number) const OVERRIDE;
- virtual unsigned int GetPageCount() const OVERRIDE;
+ virtual gfx::Rect GetPageBounds(unsigned int page_number) const override;
+ virtual unsigned int GetPageCount() const override;
- virtual gfx::NativeDrawingContext context() const OVERRIDE;
+ virtual gfx::NativeDrawingContext context() const override;
#if defined(OS_WIN)
virtual bool Playback(gfx::NativeDrawingContext hdc,
- const RECT* rect) const OVERRIDE;
- virtual bool SafePlayback(gfx::NativeDrawingContext hdc) const OVERRIDE;
+ const RECT* rect) const override;
+ virtual bool SafePlayback(gfx::NativeDrawingContext hdc) const override;
#elif defined(OS_MACOSX)
virtual bool RenderPage(unsigned int page_number,
gfx::NativeDrawingContext context,
const CGRect rect,
- const MacRenderPageParams& params) const OVERRIDE;
+ const MacRenderPageParams& params) const override;
#endif
#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
diff --git a/printing/printing_context_android.h b/printing/printing_context_android.h
index fee2259..32f11be 100644
--- a/printing/printing_context_android.h
+++ b/printing/printing_context_android.h
@@ -34,19 +34,19 @@ class PRINTING_EXPORT PrintingContextAndroid : public PrintingContext {
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
- const PrintSettingsCallback& callback) OVERRIDE;
- virtual Result UseDefaultSettings() OVERRIDE;
- virtual gfx::Size GetPdfPaperSizeDeviceUnits() OVERRIDE;
+ const PrintSettingsCallback& callback) override;
+ virtual Result UseDefaultSettings() override;
+ virtual gfx::Size GetPdfPaperSizeDeviceUnits() override;
virtual Result UpdatePrinterSettings(bool external_preview,
- bool show_system_dialog) OVERRIDE;
- virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
- virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
- virtual Result NewPage() OVERRIDE;
- virtual Result PageDone() OVERRIDE;
- virtual Result DocumentDone() OVERRIDE;
- virtual void Cancel() OVERRIDE;
- virtual void ReleaseContext() OVERRIDE;
- virtual gfx::NativeDrawingContext context() const OVERRIDE;
+ bool show_system_dialog) override;
+ virtual Result InitWithSettings(const PrintSettings& settings) override;
+ virtual Result NewDocument(const base::string16& document_name) override;
+ virtual Result NewPage() override;
+ virtual Result PageDone() override;
+ virtual Result DocumentDone() override;
+ virtual void Cancel() override;
+ virtual void ReleaseContext() override;
+ virtual gfx::NativeDrawingContext context() const override;
// Registers JNI bindings for RegisterContext.
static bool RegisterPrintingContext(JNIEnv* env);
diff --git a/printing/printing_context_linux.h b/printing/printing_context_linux.h
index ca7085a..b0ea1f6 100644
--- a/printing/printing_context_linux.h
+++ b/printing/printing_context_linux.h
@@ -40,19 +40,19 @@ class PRINTING_EXPORT PrintingContextLinux : public PrintingContext {
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
- const PrintSettingsCallback& callback) OVERRIDE;
- virtual gfx::Size GetPdfPaperSizeDeviceUnits() OVERRIDE;
- virtual Result UseDefaultSettings() OVERRIDE;
+ const PrintSettingsCallback& callback) override;
+ virtual gfx::Size GetPdfPaperSizeDeviceUnits() override;
+ virtual Result UseDefaultSettings() override;
virtual Result UpdatePrinterSettings(bool external_preview,
- bool show_system_dialog) OVERRIDE;
- virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
- virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
- virtual Result NewPage() OVERRIDE;
- virtual Result PageDone() OVERRIDE;
- virtual Result DocumentDone() OVERRIDE;
- virtual void Cancel() OVERRIDE;
- virtual void ReleaseContext() OVERRIDE;
- virtual gfx::NativeDrawingContext context() const OVERRIDE;
+ bool show_system_dialog) override;
+ virtual Result InitWithSettings(const PrintSettings& settings) override;
+ virtual Result NewDocument(const base::string16& document_name) override;
+ virtual Result NewPage() override;
+ virtual Result PageDone() override;
+ virtual Result DocumentDone() override;
+ virtual void Cancel() override;
+ virtual void ReleaseContext() override;
+ virtual gfx::NativeDrawingContext context() const override;
private:
base::string16 document_name_;
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index 609080e..3701597 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -28,19 +28,19 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
- const PrintSettingsCallback& callback) OVERRIDE;
- virtual Result UseDefaultSettings() OVERRIDE;
- virtual gfx::Size GetPdfPaperSizeDeviceUnits() OVERRIDE;
+ const PrintSettingsCallback& callback) override;
+ virtual Result UseDefaultSettings() override;
+ virtual gfx::Size GetPdfPaperSizeDeviceUnits() override;
virtual Result UpdatePrinterSettings(bool external_preview,
- bool show_system_dialog) OVERRIDE;
- virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
- virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
- virtual Result NewPage() OVERRIDE;
- virtual Result PageDone() OVERRIDE;
- virtual Result DocumentDone() OVERRIDE;
- virtual void Cancel() OVERRIDE;
- virtual void ReleaseContext() OVERRIDE;
- virtual gfx::NativeDrawingContext context() const OVERRIDE;
+ bool show_system_dialog) override;
+ virtual Result InitWithSettings(const PrintSettings& settings) override;
+ virtual Result NewDocument(const base::string16& document_name) override;
+ virtual Result NewPage() override;
+ virtual Result PageDone() override;
+ virtual Result DocumentDone() override;
+ virtual void Cancel() override;
+ virtual void ReleaseContext() override;
+ virtual gfx::NativeDrawingContext context() const override;
private:
// Initializes PrintSettings from |print_info_|. This must be called
diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_no_system_dialog.h
index 0c5e0b5..c155e33 100644
--- a/printing/printing_context_no_system_dialog.h
+++ b/printing/printing_context_no_system_dialog.h
@@ -24,19 +24,19 @@ class PRINTING_EXPORT PrintingContextNoSystemDialog : public PrintingContext {
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
- const PrintSettingsCallback& callback) OVERRIDE;
- virtual Result UseDefaultSettings() OVERRIDE;
- virtual gfx::Size GetPdfPaperSizeDeviceUnits() OVERRIDE;
+ const PrintSettingsCallback& callback) override;
+ virtual Result UseDefaultSettings() override;
+ virtual gfx::Size GetPdfPaperSizeDeviceUnits() override;
virtual Result UpdatePrinterSettings(bool external_preview,
- bool show_system_dialog) OVERRIDE;
- virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
- virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
- virtual Result NewPage() OVERRIDE;
- virtual Result PageDone() OVERRIDE;
- virtual Result DocumentDone() OVERRIDE;
- virtual void Cancel() OVERRIDE;
- virtual void ReleaseContext() OVERRIDE;
- virtual gfx::NativeDrawingContext context() const OVERRIDE;
+ bool show_system_dialog) override;
+ virtual Result InitWithSettings(const PrintSettings& settings) override;
+ virtual Result NewDocument(const base::string16& document_name) override;
+ virtual Result NewPage() override;
+ virtual Result PageDone() override;
+ virtual Result DocumentDone() override;
+ virtual void Cancel() override;
+ virtual void ReleaseContext() override;
+ virtual gfx::NativeDrawingContext context() const override;
private:
DISALLOW_COPY_AND_ASSIGN(PrintingContextNoSystemDialog);
diff --git a/printing/printing_context_system_dialog_win.h b/printing/printing_context_system_dialog_win.h
index 9f07b0e..0a797b2 100644
--- a/printing/printing_context_system_dialog_win.h
+++ b/printing/printing_context_system_dialog_win.h
@@ -25,8 +25,8 @@ class PRINTING_EXPORT PrintingContextSytemDialogWin
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
- const PrintSettingsCallback& callback) OVERRIDE;
- virtual void Cancel() OVERRIDE;
+ const PrintSettingsCallback& callback) override;
+ virtual void Cancel() override;
private:
friend class MockPrintingContextWin;
diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
index e7869dc..933162a 100644
--- a/printing/printing_context_win.h
+++ b/printing/printing_context_win.h
@@ -24,19 +24,19 @@ class PRINTING_EXPORT PrintingContextWin : public PrintingContext {
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
- const PrintSettingsCallback& callback) OVERRIDE;
- virtual Result UseDefaultSettings() OVERRIDE;
- virtual gfx::Size GetPdfPaperSizeDeviceUnits() OVERRIDE;
+ const PrintSettingsCallback& callback) override;
+ virtual Result UseDefaultSettings() override;
+ virtual gfx::Size GetPdfPaperSizeDeviceUnits() override;
virtual Result UpdatePrinterSettings(bool external_preview,
- bool show_system_dialog) OVERRIDE;
- virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
- virtual Result NewDocument(const base::string16& document_name) OVERRIDE;
- virtual Result NewPage() OVERRIDE;
- virtual Result PageDone() OVERRIDE;
- virtual Result DocumentDone() OVERRIDE;
- virtual void Cancel() OVERRIDE;
- virtual void ReleaseContext() OVERRIDE;
- virtual gfx::NativeDrawingContext context() const OVERRIDE;
+ bool show_system_dialog) override;
+ virtual Result InitWithSettings(const PrintSettings& settings) override;
+ virtual Result NewDocument(const base::string16& document_name) override;
+ virtual Result NewPage() override;
+ virtual Result PageDone() override;
+ virtual Result DocumentDone() override;
+ virtual void Cancel() override;
+ virtual void ReleaseContext() override;
+ virtual gfx::NativeDrawingContext context() const override;
protected:
static HWND GetRootWindow(gfx::NativeView view);
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 7f6b66b..6777434 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -24,8 +24,8 @@ class PrintingContextTest : public PrintingTest<testing::Test>,
}
// PrintingContext::Delegate methods.
- virtual gfx::NativeView GetParentView() OVERRIDE { return NULL; }
- virtual std::string GetAppLocale() OVERRIDE { return std::string(); }
+ virtual gfx::NativeView GetParentView() override { return NULL; }
+ virtual std::string GetAppLocale() override { return std::string(); }
protected:
PrintingContext::Result result() const { return result_; }
@@ -42,7 +42,7 @@ class MockPrintingContextWin : public PrintingContextSytemDialogWin {
protected:
// This is a fake PrintDlgEx implementation that sets the right fields in
// |lppd| to trigger a bug in older revisions of PrintingContext.
- HRESULT ShowPrintDialog(PRINTDLGEX* lppd) OVERRIDE {
+ HRESULT ShowPrintDialog(PRINTDLGEX* lppd) override {
// The interesting bits:
// Pretend the user hit print
lppd->dwResultAction = PD_RESULT_PRINT;