Chromium Code Reviews| Index: chrome/browser/chromeos/login/helper.cc |
| diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc |
| index 69696fcda58e15ea83a4fd2946f353c44d462dfa..f6962d1a7eb382c48ae4bda89eef0e519db5c358 100644 |
| --- a/chrome/browser/chromeos/login/helper.cc |
| +++ b/chrome/browser/chromeos/login/helper.cc |
| @@ -15,6 +15,7 @@ |
| #include "chrome/grit/generated_resources.h" |
| #include "chromeos/chromeos_switches.h" |
| #include "chromeos/network/managed_network_configuration_handler.h" |
| +#include "chromeos/network/network_connection_handler.h" |
| #include "chromeos/network/network_handler.h" |
| #include "chromeos/network/network_state.h" |
| #include "chromeos/network/network_state_handler.h" |
| @@ -149,17 +150,6 @@ void NetworkStateHelper::CreateNetworkFromOnc( |
| base::Unretained(this))); |
| } |
| -void NetworkStateHelper::OnCreateConfiguration( |
| - const std::string& service_path) const { |
| - // Do Nothing. |
| -} |
| - |
| -void NetworkStateHelper::OnCreateConfigurationFailed( |
| - const std::string& error_name, |
| - scoped_ptr<base::DictionaryValue> error_data) const { |
| - LOG(ERROR) << "Failed to create network configuration: " << error_name; |
| -} |
| - |
| bool NetworkStateHelper::IsConnected() const { |
| chromeos::NetworkStateHandler* nsh = |
| chromeos::NetworkHandler::Get()->network_state_handler(); |
| @@ -174,6 +164,20 @@ bool NetworkStateHelper::IsConnecting() const { |
| chromeos::NetworkTypePattern::Default()) != nullptr; |
| } |
| +void NetworkStateHelper::OnCreateConfiguration( |
| + const std::string& service_path) const { |
| + // Connect to the network. |
| + NetworkHandler::Get()->network_connection_handler()->ConnectToNetwork( |
| + service_path, base::Bind(&base::DoNothing), |
| + network_handler::ErrorCallback(), false); |
| +} |
| + |
| +void NetworkStateHelper::OnCreateConfigurationFailed( |
| + const std::string& error_name, |
| + scoped_ptr<base::DictionaryValue> error_data) const { |
| + LOG(ERROR) << "Failed to create network configuration: " << error_name; |
|
achuithb
2015/11/05 23:26:12
Should we be showing the network error screen here
xdai1
2015/11/06 23:23:02
Done.
|
| +} |
| + |
| content::StoragePartition* GetSigninPartition() { |
| content::WebContents* embedder = GetLoginWebContents(); |
| if (!embedder) |