| 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 #include "extensions/shell/browser/shell_network_controller_chromeos.h" | 5 #include "extensions/shell/browser/shell_network_controller_chromeos.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 } | 47 } |
| 48 | 48 |
| 49 } // namespace | 49 } // namespace |
| 50 | 50 |
| 51 ShellNetworkController::ShellNetworkController( | 51 ShellNetworkController::ShellNetworkController( |
| 52 const std::string& preferred_network_name) | 52 const std::string& preferred_network_name) |
| 53 : state_(STATE_IDLE), | 53 : state_(STATE_IDLE), |
| 54 preferred_network_name_(preferred_network_name), | 54 preferred_network_name_(preferred_network_name), |
| 55 preferred_network_is_active_(false), | 55 preferred_network_is_active_(false), |
| 56 weak_ptr_factory_(this) { | 56 weak_ptr_factory_(this) { |
| 57 chromeos::NetworkHandler::Initialize(); | |
| 58 chromeos::NetworkStateHandler* state_handler = | 57 chromeos::NetworkStateHandler* state_handler = |
| 59 chromeos::NetworkHandler::Get()->network_state_handler(); | 58 chromeos::NetworkHandler::Get()->network_state_handler(); |
| 60 state_handler->AddObserver(this, FROM_HERE); | 59 state_handler->AddObserver(this, FROM_HERE); |
| 61 state_handler->SetTechnologyEnabled( | 60 state_handler->SetTechnologyEnabled( |
| 62 chromeos::NetworkTypePattern::Primitive(shill::kTypeWifi), | 61 chromeos::NetworkTypePattern::Primitive(shill::kTypeWifi), |
| 63 true, | 62 true, |
| 64 base::Bind(&HandleEnableWifiError)); | 63 base::Bind(&HandleEnableWifiError)); |
| 65 | 64 |
| 66 // If we're unconnected, trigger a connection attempt and start scanning. | 65 // If we're unconnected, trigger a connection attempt and start scanning. |
| 67 NetworkConnectionStateChanged(NULL); | 66 NetworkConnectionStateChanged(NULL); |
| 68 } | 67 } |
| 69 | 68 |
| 70 ShellNetworkController::~ShellNetworkController() { | 69 ShellNetworkController::~ShellNetworkController() { |
| 71 chromeos::NetworkHandler::Get()->network_state_handler()->RemoveObserver( | 70 chromeos::NetworkHandler::Get()->network_state_handler()->RemoveObserver( |
| 72 this, FROM_HERE); | 71 this, FROM_HERE); |
| 73 chromeos::NetworkHandler::Shutdown(); | |
| 74 } | 72 } |
| 75 | 73 |
| 76 void ShellNetworkController::NetworkListChanged() { | 74 void ShellNetworkController::NetworkListChanged() { |
| 77 VLOG(1) << "Network list changed"; | 75 VLOG(1) << "Network list changed"; |
| 78 ConnectIfUnconnected(); | 76 ConnectIfUnconnected(); |
| 79 } | 77 } |
| 80 | 78 |
| 81 void ShellNetworkController::NetworkConnectionStateChanged( | 79 void ShellNetworkController::NetworkConnectionStateChanged( |
| 82 const chromeos::NetworkState* network) { | 80 const chromeos::NetworkState* network) { |
| 83 if (network) { | 81 if (network) { |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 } | 199 } |
| 202 | 200 |
| 203 void ShellNetworkController::HandleConnectionError( | 201 void ShellNetworkController::HandleConnectionError( |
| 204 const std::string& error_name, | 202 const std::string& error_name, |
| 205 scoped_ptr<base::DictionaryValue> error_data) { | 203 scoped_ptr<base::DictionaryValue> error_data) { |
| 206 LOG(WARNING) << "Unable to connect to network: " << error_name; | 204 LOG(WARNING) << "Unable to connect to network: " << error_name; |
| 207 state_ = STATE_IDLE; | 205 state_ = STATE_IDLE; |
| 208 } | 206 } |
| 209 | 207 |
| 210 } // namespace extensions | 208 } // namespace extensions |
| OLD | NEW |