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/chromeos/net/network_portal_detector.h" | 5 #include "chrome/browser/chromeos/net/network_portal_detector.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/chromeos/cros/cros_library.h" | 12 #include "chrome/browser/chromeos/cros/cros_library.h" |
13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
14 #include "content/public/browser/browser_thread.h" | |
15 #include "grit/generated_resources.h" | 14 #include "grit/generated_resources.h" |
16 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" |
17 | 16 |
18 using captive_portal::CaptivePortalDetector; | 17 using captive_portal::CaptivePortalDetector; |
19 | 18 |
20 namespace chromeos { | 19 namespace chromeos { |
21 | 20 |
22 namespace { | 21 namespace { |
23 | 22 |
24 // Maximum number of portal detections for the same active network | 23 // Maximum number of portal detections for the same active network |
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
309 } | 308 } |
310 | 309 |
311 base::TimeTicks NetworkPortalDetector::GetCurrentTimeTicks() const { | 310 base::TimeTicks NetworkPortalDetector::GetCurrentTimeTicks() const { |
312 if (time_ticks_for_testing_.is_null()) | 311 if (time_ticks_for_testing_.is_null()) |
313 return base::TimeTicks::Now(); | 312 return base::TimeTicks::Now(); |
314 else | 313 else |
315 return time_ticks_for_testing_; | 314 return time_ticks_for_testing_; |
316 } | 315 } |
317 | 316 |
318 } // namespace chromeos | 317 } // namespace chromeos |
OLD | NEW |