Update to Chromium revision 40af916d (#303546).

- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2014-11-12 19:25:15 +00:00
parent 470518a52e
commit eef89ccdd3
329 changed files with 3160 additions and 3731 deletions

View File

@ -20,32 +20,32 @@ class CefPrintSettingsImpl
bool read_only);
// CefPrintSettings methods.
virtual bool IsValid() OVERRIDE;
virtual bool IsReadOnly() OVERRIDE;
virtual CefRefPtr<CefPrintSettings> Copy() OVERRIDE;
virtual void SetOrientation(bool landscape) OVERRIDE;
virtual bool IsLandscape() OVERRIDE;
virtual void SetPrinterPrintableArea(
bool IsValid() override;
bool IsReadOnly() override;
CefRefPtr<CefPrintSettings> Copy() override;
void SetOrientation(bool landscape) override;
bool IsLandscape() override;
void SetPrinterPrintableArea(
const CefSize& physical_size_device_units,
const CefRect& printable_area_device_units,
bool landscape_needs_flip) OVERRIDE;
virtual void SetDeviceName(const CefString& name) OVERRIDE;
virtual CefString GetDeviceName() OVERRIDE;
virtual void SetDPI(int dpi) OVERRIDE;
virtual int GetDPI() OVERRIDE;
virtual void SetPageRanges(const PageRangeList& ranges) OVERRIDE;
virtual size_t GetPageRangesCount() OVERRIDE;
virtual void GetPageRanges(PageRangeList& ranges) OVERRIDE;
virtual void SetSelectionOnly(bool selection_only) OVERRIDE;
virtual bool IsSelectionOnly() OVERRIDE;
virtual void SetCollate(bool collate) OVERRIDE;
virtual bool WillCollate() OVERRIDE;
virtual void SetColorModel(ColorModel model) OVERRIDE;
virtual ColorModel GetColorModel() OVERRIDE;
virtual void SetCopies(int copies) OVERRIDE;
virtual int GetCopies() OVERRIDE;
virtual void SetDuplexMode(DuplexMode mode) OVERRIDE;
virtual DuplexMode GetDuplexMode() OVERRIDE;
bool landscape_needs_flip) override;
void SetDeviceName(const CefString& name) override;
CefString GetDeviceName() override;
void SetDPI(int dpi) override;
int GetDPI() override;
void SetPageRanges(const PageRangeList& ranges) override;
size_t GetPageRangesCount() override;
void GetPageRanges(PageRangeList& ranges) override;
void SetSelectionOnly(bool selection_only) override;
bool IsSelectionOnly() override;
void SetCollate(bool collate) override;
bool WillCollate() override;
void SetColorModel(ColorModel model) override;
ColorModel GetColorModel() override;
void SetCopies(int copies) override;
int GetCopies() override;
void SetDuplexMode(DuplexMode mode) override;
DuplexMode GetDuplexMode() override;
// Must hold the controller lock while using this value.
const printing::PrintSettings& print_settings() { return const_value(); }