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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/prefs/pref_service.h"
13 #include "base/time/tick_clock.h" 12 #include "base/time/tick_clock.h"
14 #include "build/build_config.h" 13 #include "build/build_config.h"
15 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/common/pref_names.h" 16 #include "chrome/common/pref_names.h"
18 #include "components/captive_portal/captive_portal_types.h" 17 #include "components/captive_portal/captive_portal_types.h"
18 #include "components/prefs/pref_service.h"
19 #include "content/public/browser/notification_service.h" 19 #include "content/public/browser/notification_service.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include "base/win/windows_version.h" 22 #include "base/win/windows_version.h"
23 #endif 23 #endif
24 24
25 using captive_portal::CaptivePortalResult; 25 using captive_portal::CaptivePortalResult;
26 26
27 namespace { 27 namespace {
28 28
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 return base::TimeTicks::Now(); 384 return base::TimeTicks::Now();
385 } 385 }
386 386
387 bool CaptivePortalService::DetectionInProgress() const { 387 bool CaptivePortalService::DetectionInProgress() const {
388 return state_ == STATE_CHECKING_FOR_PORTAL; 388 return state_ == STATE_CHECKING_FOR_PORTAL;
389 } 389 }
390 390
391 bool CaptivePortalService::TimerRunning() const { 391 bool CaptivePortalService::TimerRunning() const {
392 return check_captive_portal_timer_.IsRunning(); 392 return check_captive_portal_timer_.IsRunning();
393 } 393 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698