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" | 20 #include "chrome/browser/captive_portal/captive_portal_detector.h" |
21 #include "chrome/browser/chromeos/net/network_portal_detector.h" | 21 #include "chrome/browser/chromeos/net/network_portal_detector.h" |
| 22 #include "chrome/browser/chromeos/net/network_portal_detector_notification.h" |
22 #include "chromeos/network/network_state_handler_observer.h" | 23 #include "chromeos/network/network_state_handler_observer.h" |
23 #include "content/public/browser/notification_observer.h" | 24 #include "content/public/browser/notification_observer.h" |
24 #include "content/public/browser/notification_registrar.h" | 25 #include "content/public/browser/notification_registrar.h" |
25 #include "net/url_request/url_fetcher.h" | 26 #include "net/url_request/url_fetcher.h" |
26 #include "url/gurl.h" | 27 #include "url/gurl.h" |
27 | 28 |
28 namespace net { | 29 namespace net { |
29 class URLRequestContextGetter; | 30 class URLRequestContextGetter; |
30 } | 31 } |
31 | 32 |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 | 253 |
253 // Test time ticks used by unit tests. | 254 // Test time ticks used by unit tests. |
254 base::TimeTicks time_ticks_for_testing_; | 255 base::TimeTicks time_ticks_for_testing_; |
255 | 256 |
256 // Test timeout for a portal detection used by unit tests. | 257 // Test timeout for a portal detection used by unit tests. |
257 base::TimeDelta request_timeout_for_testing_; | 258 base::TimeDelta request_timeout_for_testing_; |
258 | 259 |
259 // True if |request_timeout_for_testing_| is initialized. | 260 // True if |request_timeout_for_testing_| is initialized. |
260 bool request_timeout_for_testing_initialized_; | 261 bool request_timeout_for_testing_initialized_; |
261 | 262 |
| 263 // UI notification about captive portal state. |
| 264 NetworkPortalDetectorNotification notification_; |
| 265 |
262 content::NotificationRegistrar registrar_; | 266 content::NotificationRegistrar registrar_; |
263 | 267 |
264 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl); | 268 DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorImpl); |
265 }; | 269 }; |
266 | 270 |
267 } // namespace chromeos | 271 } // namespace chromeos |
268 | 272 |
269 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ | 273 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_IMPL_H_ |
OLD | NEW |