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

Unified Diff: chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc

Issue 834383004: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/login/ui. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
diff --git a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
index 20b5f6fb4cca03f18172ab2506525eee4d289760..e60b2a709d4c27f6ab547068f278f73524320910 100644
--- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
@@ -30,12 +30,9 @@ class CaptivePortalWindowProxyStubDelegate
CaptivePortalWindowProxyStubDelegate(): num_portal_notifications_(0) {
}
- virtual ~CaptivePortalWindowProxyStubDelegate() {
- }
+ ~CaptivePortalWindowProxyStubDelegate() override {}
- virtual void OnPortalDetected() override {
- ++num_portal_notifications_;
- }
+ void OnPortalDetected() override { ++num_portal_notifications_; }
int num_portal_notifications() const { return num_portal_notifications_; }
@@ -74,12 +71,12 @@ class CaptivePortalWindowTest : public InProcessBrowserTest {
ASSERT_EQ(num_portal_notifications, delegate_.num_portal_notifications());
}
- virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
command_line->AppendSwitch(chromeos::switches::kLoginManager);
}
- virtual void SetUpOnMainThread() override {
+ void SetUpOnMainThread() override {
host_ = LoginDisplayHostImpl::default_host();
CHECK(host_);
content::WebContents* web_contents =
@@ -89,7 +86,7 @@ class CaptivePortalWindowTest : public InProcessBrowserTest {
new CaptivePortalWindowProxy(&delegate_, web_contents));
}
- virtual void TearDownOnMainThread() override {
+ void TearDownOnMainThread() override {
captive_portal_window_proxy_.reset();
base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_);
base::MessageLoopForUI::current()->RunUntilIdle();
@@ -177,9 +174,9 @@ class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {
public:
CaptivePortalWindowCtorDtorTest()
: LoginManagerTest(false) {}
- virtual ~CaptivePortalWindowCtorDtorTest() {}
+ ~CaptivePortalWindowCtorDtorTest() override {}
- virtual void SetUpInProcessBrowserTestFixture() override {
+ void SetUpInProcessBrowserTestFixture() override {
LoginManagerTest::SetUpInProcessBrowserTestFixture();
network_portal_detector_ = new NetworkPortalDetectorTestImpl();
« no previous file with comments | « chrome/browser/chromeos/login/ui/captive_portal_view.h ('k') | chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698