| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_NOTIFICATION_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ | 6 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 const NetworkPortalDetector::CaptivePortalState& state); | 118 const NetworkPortalDetector::CaptivePortalState& state); |
| 119 | 119 |
| 120 // NetworkStateHandlerObserver: | 120 // NetworkStateHandlerObserver: |
| 121 void DefaultNetworkChanged(const NetworkState* network) override; | 121 void DefaultNetworkChanged(const NetworkState* network) override; |
| 122 | 122 |
| 123 // NetworkPortalDetector::Observer: | 123 // NetworkPortalDetector::Observer: |
| 124 void OnPortalDetectionCompleted( | 124 void OnPortalDetectionCompleted( |
| 125 const NetworkState* network, | 125 const NetworkState* network, |
| 126 const NetworkPortalDetector::CaptivePortalState& state) override; | 126 const NetworkPortalDetector::CaptivePortalState& state) override; |
| 127 | 127 |
| 128 // Last network path for which notification was displayed. | 128 // Last network guid for which notification was displayed. |
| 129 std::string last_network_path_; | 129 std::string last_network_guid_; |
| 130 | 130 |
| 131 // Backpointer to owner. | 131 // Backpointer to owner. |
| 132 NetworkPortalDetector* network_portal_detector_ = nullptr; | 132 NetworkPortalDetector* network_portal_detector_ = nullptr; |
| 133 | 133 |
| 134 // Currently displayed authorization dialog, or NULL if none. | 134 // Currently displayed authorization dialog, or NULL if none. |
| 135 NetworkPortalWebDialog* dialog_ = nullptr; | 135 NetworkPortalWebDialog* dialog_ = nullptr; |
| 136 | 136 |
| 137 // Do not close Portal Login dialog on "No network" error in browser tests. | 137 // Do not close Portal Login dialog on "No network" error in browser tests. |
| 138 bool ignore_no_network_for_testing_ = false; | 138 bool ignore_no_network_for_testing_ = false; |
| 139 | 139 |
| 140 // This is called if the controller learns about a potential change of the | 140 // This is called if the controller learns about a potential change of the |
| 141 // captive portal. | 141 // captive portal. |
| 142 base::Closure retry_detection_callback_; | 142 base::Closure retry_detection_callback_; |
| 143 | 143 |
| 144 base::WeakPtrFactory<NetworkPortalNotificationController> weak_factory_; | 144 base::WeakPtrFactory<NetworkPortalNotificationController> weak_factory_; |
| 145 | 145 |
| 146 DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationController); | 146 DISALLOW_COPY_AND_ASSIGN(NetworkPortalNotificationController); |
| 147 }; | 147 }; |
| 148 | 148 |
| 149 } // namespace chromeos | 149 } // namespace chromeos |
| 150 | 150 |
| 151 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ | 151 #endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_NOTIFICATION_CONTROLLER_H_ |
| OLD | NEW |