1) Add basic configuration (network connection, language, keyboard layout, timezone) setup page. 2)…

chrome/browser/chromeos/login/screens/network_screen.cc

Index: chrome/browser/chromeos/login/screens/network_screen.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc
index 8c25a17a0ae96857d20989f16ff7be02f12a09b0..8d83dc0461b7f92383d3f08ff014b64a835d06f0 100644
--- a/chrome/browser/chromeos/login/screens/network_screen.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen.cc
@@ -229,11 +229,11 @@ void NetworkScreen::GetConnectedWifiNetwork(std::string* out_onc_spec) {
 }
 
 void NetworkScreen::CreateAndConnectNetworkFromOnc(
-    const std::string& onc_spec) {
+    const std::string& onc_spec,
+    const base::Closure& success_callback,
+    const base::Closure& failed_callback) {
   network_state_helper_->CreateAndConnectNetworkFromOnc(
-      onc_spec, base::Bind(&base::DoNothing),
-      base::Bind(&NetworkScreen::OnConnectNetworkFromOncFailed,
-                 base::Unretained(this)));
+      onc_spec, success_callback, failed_callback);
 }
 
 void NetworkScreen::AddObserver(Observer* observer) {
@@ -441,13 +441,4 @@ void NetworkScreen::OnSystemTimezoneChanged() {
   GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id);
 }
 
-void NetworkScreen::OnConnectNetworkFromOncFailed() {
-  if (!network_state_helper_->IsConnected() && view_) {
-    // Show error bubble.
-    view_->ShowError(l10n_util::GetStringFUTF16(
-        IDS_NETWORK_SELECTION_ERROR,
-        l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME)));
-  }
-}
-
 }  // namespace chromeos