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

Side by Side Diff: chrome/browser/captive_portal/captive_portal_service.cc

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix newly added OVERRIDEs 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 "chrome/browser/captive_portal/captive_portal_service.h" 5 #include "chrome/browser/captive_portal/captive_portal_service.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 class CaptivePortalService::RecheckBackoffEntry : public net::BackoffEntry { 145 class CaptivePortalService::RecheckBackoffEntry : public net::BackoffEntry {
146 public: 146 public:
147 explicit RecheckBackoffEntry(CaptivePortalService* captive_portal_service) 147 explicit RecheckBackoffEntry(CaptivePortalService* captive_portal_service)
148 : net::BackoffEntry( 148 : net::BackoffEntry(
149 &captive_portal_service->recheck_policy().backoff_policy), 149 &captive_portal_service->recheck_policy().backoff_policy),
150 captive_portal_service_(captive_portal_service) { 150 captive_portal_service_(captive_portal_service) {
151 } 151 }
152 152
153 private: 153 private:
154 virtual base::TimeTicks ImplGetTimeNow() const OVERRIDE { 154 virtual base::TimeTicks ImplGetTimeNow() const override {
155 return captive_portal_service_->GetCurrentTimeTicks(); 155 return captive_portal_service_->GetCurrentTimeTicks();
156 } 156 }
157 157
158 CaptivePortalService* captive_portal_service_; 158 CaptivePortalService* captive_portal_service_;
159 159
160 DISALLOW_COPY_AND_ASSIGN(RecheckBackoffEntry); 160 DISALLOW_COPY_AND_ASSIGN(RecheckBackoffEntry);
161 }; 161 };
162 162
163 CaptivePortalService::RecheckPolicy::RecheckPolicy() 163 CaptivePortalService::RecheckPolicy::RecheckPolicy()
164 : initial_backoff_no_portal_ms(600 * 1000), 164 : initial_backoff_no_portal_ms(600 * 1000),
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 return time_ticks_for_testing_; 390 return time_ticks_for_testing_;
391 } 391 }
392 392
393 bool CaptivePortalService::DetectionInProgress() const { 393 bool CaptivePortalService::DetectionInProgress() const {
394 return state_ == STATE_CHECKING_FOR_PORTAL; 394 return state_ == STATE_CHECKING_FOR_PORTAL;
395 } 395 }
396 396
397 bool CaptivePortalService::TimerRunning() const { 397 bool CaptivePortalService::TimerRunning() const {
398 return check_captive_portal_timer_.IsRunning(); 398 return check_captive_portal_timer_.IsRunning();
399 } 399 }
OLDNEW
« no previous file with comments | « chrome/browser/captive_portal/captive_portal_service.h ('k') | chrome/browser/captive_portal/captive_portal_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698