Standardize usage of virtual/override/final in printing/
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
R=vitalybuka@chromium.org
Review URL: https://codereview.chromium.org/668073002
Cr-Commit-Position: refs/heads/master@{#300573}
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index e672b89..58ae20f 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -34,20 +34,18 @@
http_encryption_t encryption, bool blocking);
// PrintBackend implementation.
- virtual bool EnumeratePrinters(PrinterList* printer_list) override;
- virtual std::string GetDefaultPrinterName() override;
- virtual bool GetPrinterSemanticCapsAndDefaults(
+ bool EnumeratePrinters(PrinterList* printer_list) override;
+ std::string GetDefaultPrinterName() override;
+ bool GetPrinterSemanticCapsAndDefaults(
const std::string& printer_name,
PrinterSemanticCapsAndDefaults* printer_info) override;
- virtual bool GetPrinterCapsAndDefaults(
- const std::string& printer_name,
- PrinterCapsAndDefaults* printer_info) override;
- virtual std::string GetPrinterDriverInfo(
- const std::string& printer_name) override;
- virtual bool IsValidPrinter(const std::string& printer_name) override;
+ bool GetPrinterCapsAndDefaults(const std::string& printer_name,
+ PrinterCapsAndDefaults* printer_info) override;
+ std::string GetPrinterDriverInfo(const std::string& printer_name) override;
+ bool IsValidPrinter(const std::string& printer_name) override;
protected:
- virtual ~PrintBackendCUPS() {}
+ ~PrintBackendCUPS() override {}
private:
// Following functions are wrappers around corresponding CUPS functions.
diff --git a/printing/metafile.h b/printing/metafile.h
index 0078d8b..12b50334 100644
--- a/printing/metafile.h
+++ b/printing/metafile.h
@@ -99,7 +99,7 @@
class PRINTING_EXPORT Metafile : public MetafilePlayer {
public:
Metafile();
- virtual ~Metafile();
+ ~Metafile() override;
// Initializes a fresh new metafile for rendering. Returns false on failure.
// Note: It should only be called from within the renderer process to allocate
@@ -163,7 +163,7 @@
bool GetDataAsVector(std::vector<char>* buffer) const;
- virtual bool SaveTo(base::File* file) const override;
+ 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 c7c1a5a..9744a9b 100644
--- a/printing/pdf_metafile_cg_mac.h
+++ b/printing/pdf_metafile_cg_mac.h
@@ -29,37 +29,36 @@
class PRINTING_EXPORT PdfMetafileCg : public Metafile {
public:
PdfMetafileCg();
- virtual ~PdfMetafileCg();
+ ~PdfMetafileCg() override;
// Metafile methods.
- virtual bool Init() override;
- virtual bool InitFromData(const void* src_buffer,
- uint32 src_buffer_size) override;
+ bool Init() override;
+ bool InitFromData(const void* src_buffer, 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;
- 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;
+ SkBaseDevice* StartPageForVectorCanvas(const gfx::Size& page_size,
+ const gfx::Rect& content_area,
+ const float& scale_factor) override;
+ bool StartPage(const gfx::Size& page_size,
+ const gfx::Rect& content_area,
+ const float& scale_factor) override;
+ bool FinishPage() override;
+ bool FinishDocument() override;
- virtual uint32 GetDataSize() const override;
- virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const override;
+ uint32 GetDataSize() const override;
+ 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;
+ gfx::Rect GetPageBounds(unsigned int page_number) const override;
+ 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;
+ CGContextRef context() const override;
- virtual bool RenderPage(unsigned int page_number,
- gfx::NativeDrawingContext context,
- const CGRect rect,
- const MacRenderPageParams& params) const override;
+ bool RenderPage(unsigned int page_number,
+ gfx::NativeDrawingContext context,
+ const CGRect rect,
+ 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 387ce9ac..706c56a 100644
--- a/printing/pdf_metafile_skia.h
+++ b/printing/pdf_metafile_skia.h
@@ -29,41 +29,39 @@
class PRINTING_EXPORT PdfMetafileSkia : public Metafile {
public:
PdfMetafileSkia();
- virtual ~PdfMetafileSkia();
+ ~PdfMetafileSkia() override;
// Metafile methods.
- virtual bool Init() override;
- virtual bool InitFromData(const void* src_buffer,
- uint32 src_buffer_size) override;
+ bool Init() override;
+ bool InitFromData(const void* src_buffer, uint32 src_buffer_size) override;
- virtual SkBaseDevice* StartPageForVectorCanvas(
- const gfx::Size& page_size,
- const gfx::Rect& content_area,
- const float& scale_factor) override;
+ SkBaseDevice* StartPageForVectorCanvas(const gfx::Size& page_size,
+ const gfx::Rect& content_area,
+ 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;
+ bool StartPage(const gfx::Size& page_size,
+ const gfx::Rect& content_area,
+ const float& scale_factor) override;
+ bool FinishPage() override;
+ bool FinishDocument() override;
- virtual uint32 GetDataSize() const override;
- virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const override;
+ uint32 GetDataSize() const override;
+ 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;
+ gfx::Rect GetPageBounds(unsigned int page_number) const override;
+ unsigned int GetPageCount() const override;
- virtual gfx::NativeDrawingContext context() const override;
+ 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;
#elif defined(OS_MACOSX)
- virtual bool RenderPage(unsigned int page_number,
- gfx::NativeDrawingContext context,
- const CGRect rect,
- const MacRenderPageParams& params) const override;
+ bool RenderPage(unsigned int page_number,
+ gfx::NativeDrawingContext context,
+ const CGRect rect,
+ const MacRenderPageParams& params) const override;
#endif
#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index 3701597..561b25d 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -22,25 +22,24 @@
class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
public:
explicit PrintingContextMac(Delegate* delegate);
- virtual ~PrintingContextMac();
+ ~PrintingContextMac() override;
// PrintingContext implementation.
- virtual void AskUserForSettings(
- int max_pages,
- bool has_selection,
- 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;
+ void AskUserForSettings(int max_pages,
+ bool has_selection,
+ const PrintSettingsCallback& callback) override;
+ Result UseDefaultSettings() override;
+ gfx::Size GetPdfPaperSizeDeviceUnits() override;
+ Result UpdatePrinterSettings(bool external_preview,
+ bool show_system_dialog) override;
+ Result InitWithSettings(const PrintSettings& settings) override;
+ Result NewDocument(const base::string16& document_name) override;
+ Result NewPage() override;
+ Result PageDone() override;
+ Result DocumentDone() override;
+ void Cancel() override;
+ void ReleaseContext() override;
+ gfx::NativeDrawingContext context() const override;
private:
// Initializes PrintSettings from |print_info_|. This must be called