Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(149)

Side by Side Diff: chrome/browser/ui/webui/web_dialog_web_contents_delegate_unittest.cc

Issue 671653002: Standardize usage of virtual/override/final in chrome/browser/ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h" 5 #include "ui/web_dialogs/web_dialog_web_contents_delegate.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 20 matching lines...) Expand all
31 using content::WebContentsTester; 31 using content::WebContentsTester;
32 using ui::WebDialogWebContentsDelegate; 32 using ui::WebDialogWebContentsDelegate;
33 33
34 namespace { 34 namespace {
35 35
36 class TestWebContentsDelegate : public WebDialogWebContentsDelegate { 36 class TestWebContentsDelegate : public WebDialogWebContentsDelegate {
37 public: 37 public:
38 explicit TestWebContentsDelegate(content::BrowserContext* context) 38 explicit TestWebContentsDelegate(content::BrowserContext* context)
39 : WebDialogWebContentsDelegate(context, new ChromeWebContentsHandler) { 39 : WebDialogWebContentsDelegate(context, new ChromeWebContentsHandler) {
40 } 40 }
41 virtual ~TestWebContentsDelegate() { 41 ~TestWebContentsDelegate() override {}
42 }
43 42
44 private: 43 private:
45 DISALLOW_COPY_AND_ASSIGN(TestWebContentsDelegate); 44 DISALLOW_COPY_AND_ASSIGN(TestWebContentsDelegate);
46 }; 45 };
47 46
48 class WebDialogWebContentsDelegateTest : public BrowserWithTestWindowTest { 47 class WebDialogWebContentsDelegateTest : public BrowserWithTestWindowTest {
49 public: 48 public:
50 virtual void SetUp() { 49 virtual void SetUp() {
51 BrowserWithTestWindowTest::SetUp(); 50 BrowserWithTestWindowTest::SetUp();
52 test_web_contents_delegate_.reset(new TestWebContentsDelegate(profile())); 51 test_web_contents_delegate_.reset(new TestWebContentsDelegate(profile()));
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 NEW_FOREGROUND_TAB, 112 NEW_FOREGROUND_TAB,
114 ui::PAGE_TRANSITION_LINK, 113 ui::PAGE_TRANSITION_LINK,
115 false)); 114 false));
116 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB, 115 test_web_contents_delegate_->AddNewContents(NULL, NULL, NEW_FOREGROUND_TAB,
117 gfx::Rect(), false, NULL); 116 gfx::Rect(), false, NULL);
118 EXPECT_EQ(0, browser()->tab_strip_model()->count()); 117 EXPECT_EQ(0, browser()->tab_strip_model()->count());
119 EXPECT_EQ(1U, chrome::GetTotalBrowserCount()); 118 EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
120 } 119 }
121 120
122 } // namespace 121 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698