| 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/login/screens/network_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
| 6 | 6 |
| 7 #include "base/location.h" | 7 #include "base/location.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 actor_->Hide(); | 71 actor_->Hide(); |
| 72 } | 72 } |
| 73 | 73 |
| 74 std::string NetworkScreen::GetName() const { | 74 std::string NetworkScreen::GetName() const { |
| 75 return WizardController::kNetworkScreenName; | 75 return WizardController::kNetworkScreenName; |
| 76 } | 76 } |
| 77 | 77 |
| 78 //////////////////////////////////////////////////////////////////////////////// | 78 //////////////////////////////////////////////////////////////////////////////// |
| 79 // NetworkScreen, NetworkStateHandlerObserver implementation: | 79 // NetworkScreen, NetworkStateHandlerObserver implementation: |
| 80 | 80 |
| 81 void NetworkScreen::NetworkManagerChanged() { | 81 void NetworkScreen::NetworkConnectionStateChanged(const NetworkState* network) { |
| 82 UpdateStatus(); | 82 UpdateStatus(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void NetworkScreen::DefaultNetworkChanged(const NetworkState* network) { | 85 void NetworkScreen::DefaultNetworkChanged(const NetworkState* network) { |
| 86 NetworkManagerChanged(); | 86 UpdateStatus(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 //////////////////////////////////////////////////////////////////////////////// | 89 //////////////////////////////////////////////////////////////////////////////// |
| 90 // NetworkScreen, public: | 90 // NetworkScreen, public: |
| 91 | 91 |
| 92 void NetworkScreen::Refresh() { | 92 void NetworkScreen::Refresh() { |
| 93 SubscribeNetworkNotification(); | 93 SubscribeNetworkNotification(); |
| 94 NetworkManagerChanged(); | 94 UpdateStatus(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 /////////////////////////////////////////////////////////////////////////////// | 97 /////////////////////////////////////////////////////////////////////////////// |
| 98 // NetworkScreen, NetworkScreenActor::Delegate implementation: | 98 // NetworkScreen, NetworkScreenActor::Delegate implementation: |
| 99 | 99 |
| 100 void NetworkScreen::OnActorDestroyed(NetworkScreenActor* actor) { | 100 void NetworkScreen::OnActorDestroyed(NetworkScreenActor* actor) { |
| 101 if (actor_ == actor) | 101 if (actor_ == actor) |
| 102 actor_ = NULL; | 102 actor_ = NULL; |
| 103 } | 103 } |
| 104 | 104 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 } | 199 } |
| 200 | 200 |
| 201 network_id_ = network_id; | 201 network_id_ = network_id; |
| 202 if (actor_) { | 202 if (actor_) { |
| 203 actor_->ShowConnectingStatus(continue_pressed_, network_id_); | 203 actor_->ShowConnectingStatus(continue_pressed_, network_id_); |
| 204 actor_->EnableContinue(false); | 204 actor_->EnableContinue(false); |
| 205 } | 205 } |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace chromeos | 208 } // namespace chromeos |
| OLD | NEW |