summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-01-22 17:17:09 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-23 01:18:44 +0000
commit374e914e95164d69df77dc6006a08dcd8734eed6 (patch)
treee951b049a57d99e2dae4022fd3a193376e87a667 /printing
parentcdc451e80f65f7112ea6d96a16f9cea5b30943ef (diff)
downloadchromium_src-374e914e95164d69df77dc6006a08dcd8734eed6.zip
chromium_src-374e914e95164d69df77dc6006a08dcd8734eed6.tar.gz
chromium_src-374e914e95164d69df77dc6006a08dcd8734eed6.tar.bz2
Update {virtual,override,final} to follow C++11 style in printing, round 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}
Diffstat (limited to 'printing')
-rw-r--r--printing/backend/print_backend_chromeos.cc18
-rw-r--r--printing/printing_context_no_system_dialog.h35
2 files changed, 25 insertions, 28 deletions
diff --git a/printing/backend/print_backend_chromeos.cc b/printing/backend/print_backend_chromeos.cc
index 2e91fb1..e0de230 100644
--- a/printing/backend/print_backend_chromeos.cc
+++ b/printing/backend/print_backend_chromeos.cc
@@ -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() {}
diff --git a/printing/printing_context_no_system_dialog.h b/printing/printing_context_no_system_dialog.h
index 6cc8c2a..112d74d 100644
--- a/printing/printing_context_no_system_dialog.h
+++ b/printing/printing_context_no_system_dialog.h
@@ -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);