Skip to content

Commit

Permalink
Update {virtual,override,final} to follow C++11 style in printing, ro…
Browse files Browse the repository at this point in the history
…und 2.

The Google style guide states that only one of {virtual,override,final}
should be used for each declaration, since override implies virtual and
final implies both virtual and override.

This patch was automatically generated with a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463

Review URL: https://codereview.chromium.org/868883003

Cr-Commit-Position: refs/heads/master@{#312724}
  • Loading branch information
zetafunction authored and Commit bot committed Jan 23, 2015
1 parent cdc451e commit 374e914
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 28 deletions.
18 changes: 8 additions & 10 deletions printing/backend/print_backend_chromeos.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,18 @@ class PrintBackendChromeOS : public PrintBackend {
PrintBackendChromeOS();

// 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 ~PrintBackendChromeOS() {}
~PrintBackendChromeOS() override {}
};

PrintBackendChromeOS::PrintBackendChromeOS() {}
Expand Down
35 changes: 17 additions & 18 deletions printing/printing_context_no_system_dialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,25 @@ namespace printing {
class PRINTING_EXPORT PrintingContextNoSystemDialog : public PrintingContext {
public:
explicit PrintingContextNoSystemDialog(Delegate* delegate);
virtual ~PrintingContextNoSystemDialog();
~PrintingContextNoSystemDialog() override;

// PrintingContext implementation.
virtual void AskUserForSettings(
int max_pages,
bool has_selection,
bool is_scripted,
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,
bool is_scripted,
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:
DISALLOW_COPY_AND_ASSIGN(PrintingContextNoSystemDialog);
Expand Down

0 comments on commit 374e914

Please sign in to comment.