OLD | NEW |
---|---|
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ |
6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ | 6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
11 #include "base/cancelable_callback.h" | 11 #include "base/cancelable_callback.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/containers/hash_tables.h" | 13 #include "base/containers/hash_tables.h" |
14 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
15 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
16 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
17 #include "base/observer_list.h" | 17 #include "base/observer_list.h" |
18 #include "base/threading/non_thread_safe.h" | 18 #include "base/threading/non_thread_safe.h" |
19 #include "base/time/time.h" | 19 #include "base/time/time.h" |
20 #include "chrome/browser/captive_portal/captive_portal_detector.h" | |
21 #include "chrome/browser/chromeos/net/network_portal_detector.h" | 20 #include "chrome/browser/chromeos/net/network_portal_detector.h" |
22 #include "chrome/browser/chromeos/net/network_portal_detector_strategy.h" | 21 #include "chrome/browser/chromeos/net/network_portal_detector_strategy.h" |
23 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h" | 22 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h" |
24 #include "chromeos/network/network_state_handler_observer.h" | 23 #include "chromeos/network/network_state_handler_observer.h" |
24 #include "components/captive_portal/captive_portal_detector.h" | |
mmenke
2014/04/23 14:56:36
optional: While you're here, could just forward d
mmenke
2014/04/23 14:56:36
Should probably include captive_portal_types.h
stevenjb
2014/04/23 19:48:34
Actually, we need this for CaptivePortalDetector::
| |
25 #include "content/public/browser/notification_observer.h" | 25 #include "content/public/browser/notification_observer.h" |
26 #include "content/public/browser/notification_registrar.h" | 26 #include "content/public/browser/notification_registrar.h" |
27 #include "net/url_request/url_fetcher.h" | 27 #include "net/url_request/url_fetcher.h" |
28 #include "url/gurl.h" | 28 #include "url/gurl.h" |
29 | 29 |
30 namespace net { | 30 namespace net { |
31 class URLRequestContextGetter; | 31 class URLRequestContextGetter; |
32 } | 32 } |
33 | 33 |
34 namespace chromeos { | 34 namespace chromeos { |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
246 | 246 |
247 // Test time ticks used by unit tests. | 247 // Test time ticks used by unit tests. |
248 base::TimeTicks time_ticks_for_testing_; | 248 base::TimeTicks time_ticks_for_testing_; |
249 | 249 |
250 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl); | 250 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl); |
251 }; | 251 }; |
252 | 252 |
253 } // namespace chromeos | 253 } // namespace chromeos |
254 | 254 |
255 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ | 255 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ |
OLD | NEW |