summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-02-05 19:37:13 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-06 03:39:11 +0000
commitff7922e556477cb556e3c858b5273a084e80d953 (patch)
tree31ba1d38a1f3f14bcfe890495ad638d76829681a /printing
parent1b6d8e7452e6976532fbf920124788b3e054c5ae (diff)
downloadchromium_src-ff7922e556477cb556e3c858b5273a084e80d953.zip
chromium_src-ff7922e556477cb556e3c858b5273a084e80d953.tar.gz
chromium_src-ff7922e556477cb556e3c858b5273a084e80d953.tar.bz2
Update {virtual,override,final} to follow C++11 style in printing.
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 an OS=android build using a variation of https://codereview.chromium.org/598073004. BUG=417463 Review URL: https://codereview.chromium.org/900793008 Cr-Commit-Position: refs/heads/master@{#314957}
Diffstat (limited to 'printing')
-rw-r--r--printing/backend/print_backend_dummy.cc2
-rw-r--r--printing/printing_context_android.h35
2 files changed, 18 insertions, 19 deletions
diff --git a/printing/backend/print_backend_dummy.cc b/printing/backend/print_backend_dummy.cc
index db269a7..917078b 100644
--- a/printing/backend/print_backend_dummy.cc
+++ b/printing/backend/print_backend_dummy.cc
@@ -48,7 +48,7 @@ class DummyPrintBackend : public PrintBackend {
}
private:
- ~DummyPrintBackend() {}
+ ~DummyPrintBackend() override {}
DISALLOW_COPY_AND_ASSIGN(DummyPrintBackend);
};
diff --git a/printing/printing_context_android.h b/printing/printing_context_android.h
index 3823b28..6962c09 100644
--- a/printing/printing_context_android.h
+++ b/printing/printing_context_android.h
@@ -19,7 +19,7 @@ namespace printing {
class PRINTING_EXPORT PrintingContextAndroid : public PrintingContext {
public:
explicit PrintingContextAndroid(Delegate* delegate);
- virtual ~PrintingContextAndroid();
+ ~PrintingContextAndroid() override;
// Called when the page is successfully written to a PDF using the file
// descriptor specified, or when the printing operation failed.
@@ -33,23 +33,22 @@ class PRINTING_EXPORT PrintingContextAndroid : public PrintingContext {
void ShowSystemDialogDone(JNIEnv* env, jobject obj);
// 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;
// Registers JNI bindings for RegisterContext.
static bool RegisterPrintingContext(JNIEnv* env);