OLD | NEW |
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" | 12 #include "base/prefs/pref_service.h" |
13 #include "base/time/tick_clock.h" | 13 #include "base/time/tick_clock.h" |
| 14 #include "build/build_config.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
16 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
17 #include "components/captive_portal/captive_portal_types.h" | 18 #include "components/captive_portal/captive_portal_types.h" |
18 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" |
19 | 20 |
20 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
21 #include "base/win/windows_version.h" | 22 #include "base/win/windows_version.h" |
22 #endif | 23 #endif |
23 | 24 |
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 return base::TimeTicks::Now(); | 384 return base::TimeTicks::Now(); |
384 } | 385 } |
385 | 386 |
386 bool CaptivePortalService::DetectionInProgress() const { | 387 bool CaptivePortalService::DetectionInProgress() const { |
387 return state_ == STATE_CHECKING_FOR_PORTAL; | 388 return state_ == STATE_CHECKING_FOR_PORTAL; |
388 } | 389 } |
389 | 390 |
390 bool CaptivePortalService::TimerRunning() const { | 391 bool CaptivePortalService::TimerRunning() const { |
391 return check_captive_portal_timer_.IsRunning(); | 392 return check_captive_portal_timer_.IsRunning(); |
392 } | 393 } |
OLD | NEW |