| Index: chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
|
| diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
|
| index 48711126c493740a65f718b7d7dbdc39fa15afcd..facedba11f5c9294c29b47b27d7ee59be0c048c5 100644
|
| --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
|
| +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc
|
| @@ -25,7 +25,7 @@ class RequestPrintPreviewObserver : public WebContentsObserver {
|
| explicit RequestPrintPreviewObserver(WebContents* dialog)
|
| : WebContentsObserver(dialog) {
|
| }
|
| - virtual ~RequestPrintPreviewObserver() {}
|
| + ~RequestPrintPreviewObserver() override {}
|
|
|
| void set_quit_closure(const base::Closure& quit_closure) {
|
| quit_closure_ = quit_closure;
|
| @@ -33,7 +33,7 @@ class RequestPrintPreviewObserver : public WebContentsObserver {
|
|
|
| private:
|
| // content::WebContentsObserver implementation.
|
| - virtual bool OnMessageReceived(const IPC::Message& message) override {
|
| + bool OnMessageReceived(const IPC::Message& message) override {
|
| IPC_BEGIN_MESSAGE_MAP(RequestPrintPreviewObserver, message)
|
| IPC_MESSAGE_HANDLER(PrintHostMsg_RequestPrintPreview,
|
| OnRequestPrintPreview)
|
| @@ -57,7 +57,7 @@ class PrintPreviewDialogClonedObserver : public WebContentsObserver {
|
| explicit PrintPreviewDialogClonedObserver(WebContents* dialog)
|
| : WebContentsObserver(dialog) {
|
| }
|
| - virtual ~PrintPreviewDialogClonedObserver() {}
|
| + ~PrintPreviewDialogClonedObserver() override {}
|
|
|
| RequestPrintPreviewObserver* request_preview_dialog_observer() {
|
| return request_preview_dialog_observer_.get();
|
| @@ -65,9 +65,8 @@ class PrintPreviewDialogClonedObserver : public WebContentsObserver {
|
|
|
| private:
|
| // content::WebContentsObserver implementation.
|
| - virtual void DidCloneToNewWebContents(
|
| - WebContents* old_web_contents,
|
| - WebContents* new_web_contents) override {
|
| + void DidCloneToNewWebContents(WebContents* old_web_contents,
|
| + WebContents* new_web_contents) override {
|
| request_preview_dialog_observer_.reset(
|
| new RequestPrintPreviewObserver(new_web_contents));
|
| }
|
| @@ -83,15 +82,13 @@ class PrintPreviewDialogDestroyedObserver : public WebContentsObserver {
|
| : WebContentsObserver(dialog),
|
| dialog_destroyed_(false) {
|
| }
|
| - virtual ~PrintPreviewDialogDestroyedObserver() {}
|
| + ~PrintPreviewDialogDestroyedObserver() override {}
|
|
|
| bool dialog_destroyed() const { return dialog_destroyed_; }
|
|
|
| private:
|
| // content::WebContentsObserver implementation.
|
| - virtual void WebContentsDestroyed() override {
|
| - dialog_destroyed_ = true;
|
| - }
|
| + void WebContentsDestroyed() override { dialog_destroyed_ = true; }
|
|
|
| bool dialog_destroyed_;
|
|
|
| @@ -121,7 +118,7 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
|
| }
|
|
|
| private:
|
| - virtual void SetUpOnMainThread() override {
|
| + void SetUpOnMainThread() override {
|
| WebContents* first_tab =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| ASSERT_TRUE(first_tab);
|
| @@ -139,7 +136,7 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest {
|
| ASSERT_NE(first_tab, initiator_);
|
| }
|
|
|
| - virtual void TearDownOnMainThread() override {
|
| + void TearDownOnMainThread() override {
|
| cloned_tab_observer_.reset();
|
| initiator_ = NULL;
|
| }
|
|
|