Skip to content

GitLab

T
tangled
Commit d85a45c0 authored by avi@chromium.org's avatar avi@chromium.org
Browse files
Options

Add OVERRIDE to printing/. 

BUG=104314
TEST=no change

Review URL: http://codereview.chromium.org/8468031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110317 0039d316-1c4b-4281-b951-d872f2087c98
parent a5a3689b
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 72 deletions
printing/backend/print_backend_cups.cc
View file @ d85a45c0
...@@ -97,14 +97,15 @@ class PrintBackendCUPS : public PrintBackend { ...@@ -97,14 +97,15 @@ class PrintBackendCUPS : public PrintBackend {
virtual ~PrintBackendCUPS() {} virtual ~PrintBackendCUPS() {}
// PrintBackend implementation. // PrintBackend implementation.
virtual bool EnumeratePrinters(PrinterList* printer_list); virtual bool EnumeratePrinters(PrinterList* printer_list) OVERRIDE;
virtual std::string GetDefaultPrinterName(); virtual std::string GetDefaultPrinterName() OVERRIDE;
virtual bool GetPrinterCapsAndDefaults(const std::string& printer_name, virtual bool GetPrinterCapsAndDefaults(
PrinterCapsAndDefaults* printer_info); const std::string& printer_name,
PrinterCapsAndDefaults* printer_info) OVERRIDE;
virtual bool IsValidPrinter(const std::string& printer_name); virtual bool IsValidPrinter(const std::string& printer_name) OVERRIDE;
private: private:
// Following functions are wrappers around corresponding CUPS functions. // Following functions are wrappers around corresponding CUPS functions.
......
printing/emf_win.h
View file @ d85a45c0
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <vector> #include <vector>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h" #include "base/gtest_prod_util.h"
#include "printing/metafile.h" #include "printing/metafile.h"
...@@ -42,45 +43,46 @@ class PRINTING_EXPORT Emf : public Metafile { ...@@ -42,45 +43,46 @@ class PRINTING_EXPORT Emf : public Metafile {
virtual bool InitFromFile(const FilePath& metafile_path); virtual bool InitFromFile(const FilePath& metafile_path);
// Metafile methods. // Metafile methods.
virtual bool Init(); virtual bool Init() OVERRIDE;
virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size); virtual bool InitFromData(const void* src_buffer,
uint32 src_buffer_size) OVERRIDE;
virtual SkDevice* StartPageForVectorCanvas( virtual SkDevice* StartPageForVectorCanvas(
const gfx::Size& page_size, const gfx::Rect& content_area, const gfx::Size& page_size, const gfx::Rect& content_area,
const float& scale_factor); const float& scale_factor) OVERRIDE;
// Inserts a custom GDICOMMENT records indicating StartPage/EndPage calls // Inserts a custom GDICOMMENT records indicating StartPage/EndPage calls
// (since StartPage and EndPage do not work in a metafile DC). Only valid // (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 // when hdc_ is non-NULL. |page_size|, |content_area|, and |scale_factor| are
// ignored. // ignored.
virtual bool StartPage(const gfx::Size& page_size, virtual bool StartPage(const gfx::Size& page_size,
const gfx::Rect& content_area, const gfx::Rect& content_area,
const float& scale_factor); const float& scale_factor) OVERRIDE;
virtual bool FinishPage(); virtual bool FinishPage() OVERRIDE;
virtual bool FinishDocument(); virtual bool FinishDocument() OVERRIDE;
virtual uint32 GetDataSize() const; virtual uint32 GetDataSize() const OVERRIDE;
virtual bool GetData(void* buffer, uint32 size) const; virtual bool GetData(void* buffer, uint32 size) const OVERRIDE;
// Saves the EMF data to a file as-is. It is recommended to use the .emf file // Saves the EMF data to a file as-is. It is recommended to use the .emf file
// extension but it is not enforced. This function synchronously writes to the // extension but it is not enforced. This function synchronously writes to the
// file. For testing only. // file. For testing only.
virtual bool SaveTo(const FilePath& file_path) const; virtual bool SaveTo(const FilePath& file_path) const OVERRIDE;
// Should be passed to Playback to keep the exact same size. // Should be passed to Playback to keep the exact same size.
virtual gfx::Rect GetPageBounds(unsigned int page_number) const; virtual gfx::Rect GetPageBounds(unsigned int page_number) const OVERRIDE;
virtual unsigned int GetPageCount() const { virtual unsigned int GetPageCount() const OVERRIDE {
return page_count_; return page_count_;
} }
virtual HDC context() const { virtual HDC context() const OVERRIDE {
return hdc_; return hdc_;
} }
virtual bool Playback(HDC hdc, const RECT* rect) const; virtual bool Playback(HDC hdc, const RECT* rect) const OVERRIDE;
virtual bool SafePlayback(HDC hdc) const; virtual bool SafePlayback(HDC hdc) const OVERRIDE;
virtual HENHMETAFILE emf() const { virtual HENHMETAFILE emf() const OVERRIDE {
return emf_; return emf_;
} }
......
printing/pdf_metafile_cg_mac.h
View file @ d85a45c0
...@@ -30,31 +30,32 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile { ...@@ -30,31 +30,32 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile {
virtual ~PdfMetafileCg(); virtual ~PdfMetafileCg();
// Metafile methods. // Metafile methods.
virtual bool Init(); virtual bool Init() OVERRIDE;
virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size); virtual bool InitFromData(const void* src_buffer,
uint32 src_buffer_size) OVERRIDE;
// Not implemented on mac. // Not implemented on mac.
virtual SkDevice* StartPageForVectorCanvas( virtual SkDevice* StartPageForVectorCanvas(
const gfx::Size& page_size, const gfx::Rect& content_area, const gfx::Size& page_size, const gfx::Rect& content_area,
const float& scale_factor); const float& scale_factor) OVERRIDE;
virtual bool StartPage(const gfx::Size& page_size, virtual bool StartPage(const gfx::Size& page_size,
const gfx::Rect& content_area, const gfx::Rect& content_area,
const float& scale_factor); const float& scale_factor) OVERRIDE;
virtual bool FinishPage(); virtual bool FinishPage() OVERRIDE;
virtual bool FinishDocument(); virtual bool FinishDocument() OVERRIDE;
virtual uint32 GetDataSize() const; virtual uint32 GetDataSize() const OVERRIDE;
virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const; virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const OVERRIDE;
// For testing purposes only. // For testing purposes only.
virtual bool SaveTo(const FilePath& file_path) const; virtual bool SaveTo(const FilePath& file_path) const OVERRIDE;
virtual gfx::Rect GetPageBounds(unsigned int page_number) const; virtual gfx::Rect GetPageBounds(unsigned int page_number) const OVERRIDE;
virtual unsigned int GetPageCount() const; virtual unsigned int GetPageCount() const OVERRIDE;
// Note: The returned context *must not be retained* past Close(). If it is, // Note: The returned context *must not be retained* past Close(). If it is,
// the data returned from GetData will not be valid PDF data. // the data returned from GetData will not be valid PDF data.
virtual CGContextRef context() const; virtual CGContextRef context() const OVERRIDE;
virtual bool RenderPage(unsigned int page_number, virtual bool RenderPage(unsigned int page_number,
CGContextRef context, CGContextRef context,
...@@ -62,7 +63,7 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile { ...@@ -62,7 +63,7 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile {
bool shrink_to_fit, bool shrink_to_fit,
bool stretch_to_fit, bool stretch_to_fit,
bool center_horizontally, bool center_horizontally,
bool center_vertically) const; bool center_vertically) const OVERRIDE;
private: private:
// Returns a CGPDFDocumentRef version of pdf_data_. // Returns a CGPDFDocumentRef version of pdf_data_.
......
printing/pdf_metafile_skia.h
View file @ d85a45c0
...@@ -26,34 +26,36 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile { ...@@ -26,34 +26,36 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile {
virtual ~PdfMetafileSkia(); virtual ~PdfMetafileSkia();
// Metafile methods. // Metafile methods.
virtual bool Init(); virtual bool Init() OVERRIDE;
virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size); virtual bool InitFromData(const void* src_buffer,
uint32 src_buffer_size) OVERRIDE;
virtual SkDevice* StartPageForVectorCanvas( virtual SkDevice* StartPageForVectorCanvas(
const gfx::Size& page_size, const gfx::Size& page_size,
const gfx::Rect& content_area, const gfx::Rect& content_area,
const float& scale_factor); const float& scale_factor) OVERRIDE;
virtual bool StartPage(const gfx::Size& page_size, virtual bool StartPage(const gfx::Size& page_size,
const gfx::Rect& content_area, const gfx::Rect& content_area,
const float& scale_factor); const float& scale_factor) OVERRIDE;
virtual bool FinishPage(); virtual bool FinishPage() OVERRIDE;
virtual bool FinishDocument(); virtual bool FinishDocument() OVERRIDE;
virtual uint32 GetDataSize() const; virtual uint32 GetDataSize() const OVERRIDE;
virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const; virtual bool GetData(void* dst_buffer, uint32 dst_buffer_size) const OVERRIDE;
virtual bool SaveTo(const FilePath& file_path) const; virtual bool SaveTo(const FilePath& file_path) const OVERRIDE;
virtual gfx::Rect GetPageBounds(unsigned int page_number) const; virtual gfx::Rect GetPageBounds(unsigned int page_number) const OVERRIDE;
virtual unsigned int GetPageCount() const; virtual unsigned int GetPageCount() const OVERRIDE;
virtual gfx::NativeDrawingContext context() const; virtual gfx::NativeDrawingContext context() const OVERRIDE;
#if defined(OS_WIN) #if defined(OS_WIN)
virtual bool Playback(gfx::NativeDrawingContext hdc, const RECT* rect) const; virtual bool Playback(gfx::NativeDrawingContext hdc,
virtual bool SafePlayback(gfx::NativeDrawingContext hdc) const; const RECT* rect) const OVERRIDE;
virtual HENHMETAFILE emf() const; virtual bool SafePlayback(gfx::NativeDrawingContext hdc) const OVERRIDE;
virtual HENHMETAFILE emf() const OVERRIDE;
#elif defined(OS_MACOSX) #elif defined(OS_MACOSX)
virtual bool RenderPage(unsigned int page_number, virtual bool RenderPage(unsigned int page_number,
CGContextRef context, CGContextRef context,
...@@ -61,11 +63,11 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile { ...@@ -61,11 +63,11 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile {
bool shrink_to_fit, bool shrink_to_fit,
bool stretch_to_fit, bool stretch_to_fit,
bool center_horizontally, bool center_horizontally,
bool center_vertically) const; bool center_vertically) const OVERRIDE;
#endif #endif
#if defined(OS_CHROMEOS) #if defined(OS_CHROMEOS)
virtual bool SaveToFD(const base::FileDescriptor& fd) const; virtual bool SaveToFD(const base::FileDescriptor& fd) const OVERRIDE;
#endif // if defined(OS_CHROMEOS) #endif // if defined(OS_CHROMEOS)
// Return a new metafile containing just the current page in draft mode. // Return a new metafile containing just the current page in draft mode.
......
printing/printing_context_gtk.h
View file @ d85a45c0
...@@ -35,19 +35,19 @@ class PRINTING_EXPORT PrintingContextGtk : public PrintingContext { ...@@ -35,19 +35,19 @@ class PRINTING_EXPORT PrintingContextGtk : public PrintingContext {
virtual void AskUserForSettings(gfx::NativeView parent_view, virtual void AskUserForSettings(gfx::NativeView parent_view,
int max_pages, int max_pages,
bool has_selection, bool has_selection,
PrintSettingsCallback* callback); PrintSettingsCallback* callback) OVERRIDE;
virtual Result UseDefaultSettings(); virtual Result UseDefaultSettings() OVERRIDE;
virtual Result UpdatePrinterSettings( virtual Result UpdatePrinterSettings(
const base::DictionaryValue& job_settings, const base::DictionaryValue& job_settings,
const PageRanges& ranges); const PageRanges& ranges) OVERRIDE;
virtual Result InitWithSettings(const PrintSettings& settings); virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
virtual Result NewDocument(const string16& document_name); virtual Result NewDocument(const string16& document_name) OVERRIDE;
virtual Result NewPage(); virtual Result NewPage() OVERRIDE;
virtual Result PageDone(); virtual Result PageDone() OVERRIDE;
virtual Result DocumentDone(); virtual Result DocumentDone() OVERRIDE;
virtual void Cancel(); virtual void Cancel() OVERRIDE;
virtual void ReleaseContext(); virtual void ReleaseContext() OVERRIDE;
virtual gfx::NativeDrawingContext context() const; virtual gfx::NativeDrawingContext context() const OVERRIDE;
private: private:
string16 document_name_; string16 document_name_;
......
printing/printing_context_mac.h
View file @ d85a45c0
...@@ -28,19 +28,19 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext { ...@@ -28,19 +28,19 @@ class PRINTING_EXPORT PrintingContextMac : public PrintingContext {
virtual void AskUserForSettings(gfx::NativeView parent_view, virtual void AskUserForSettings(gfx::NativeView parent_view,
int max_pages, int max_pages,
bool has_selection, bool has_selection,
PrintSettingsCallback* callback); PrintSettingsCallback* callback) OVERRIDE;
virtual Result UseDefaultSettings(); virtual Result UseDefaultSettings() OVERRIDE;
virtual Result UpdatePrinterSettings( virtual Result UpdatePrinterSettings(
const base::DictionaryValue& job_settings, const base::DictionaryValue& job_settings,
const PageRanges& ranges); const PageRanges& ranges) OVERRIDE;
virtual Result InitWithSettings(const PrintSettings& settings); virtual Result InitWithSettings(const PrintSettings& settings) OVERRIDE;
virtual Result NewDocument(const string16& document_name); virtual Result NewDocument(const string16& document_name) OVERRIDE;
virtual Result NewPage(); virtual Result NewPage() OVERRIDE;
virtual Result PageDone(); virtual Result PageDone() OVERRIDE;
virtual Result DocumentDone(); virtual Result DocumentDone() OVERRIDE;
virtual void Cancel(); virtual void Cancel() OVERRIDE;
virtual void ReleaseContext(); virtual void ReleaseContext() OVERRIDE;
virtual gfx::NativeDrawingContext context() const; virtual gfx::NativeDrawingContext context() const OVERRIDE;
private: private:
// Initializes PrintSettings from |print_info_|. This must be called // Initializes PrintSettings from |print_info_|. This must be called
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment