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

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

Issue 623293003: replace OVERRIDE and FINAL with override and final in chrome/browser/chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: run git cl format on echo_dialog_view.h 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 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 ef6b6baacaa769983d1b389ad8f39b38c4403daf..34a01036afb69ba79cb7ea33a6e7a16fd63baff8 100644
--- a/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
+++ b/chrome/browser/chromeos/login/ui/captive_portal_window_browsertest.cc
@@ -33,7 +33,7 @@ class CaptivePortalWindowProxyStubDelegate
virtual ~CaptivePortalWindowProxyStubDelegate() {
}
- virtual void OnPortalDetected() OVERRIDE {
+ virtual void OnPortalDetected() override {
++num_portal_notifications_;
}
@@ -74,12 +74,12 @@ class CaptivePortalWindowTest : public InProcessBrowserTest {
ASSERT_EQ(num_portal_notifications, delegate_.num_portal_notifications());
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
command_line->AppendSwitch(chromeos::switches::kLoginManager);
}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
host_ = LoginDisplayHostImpl::default_host();
CHECK(host_);
content::WebContents* web_contents =
@@ -89,7 +89,7 @@ class CaptivePortalWindowTest : public InProcessBrowserTest {
new CaptivePortalWindowProxy(&delegate_, web_contents));
}
- virtual void TearDownOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() override {
captive_portal_window_proxy_.reset();
base::MessageLoopForUI::current()->DeleteSoon(FROM_HERE, host_);
base::MessageLoopForUI::current()->RunUntilIdle();
@@ -179,7 +179,7 @@ class CaptivePortalWindowCtorDtorTest : public LoginManagerTest {
: LoginManagerTest(false) {}
virtual ~CaptivePortalWindowCtorDtorTest() {}
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+ virtual 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