Initial implementation of network screen WebUI handler.

chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index aa2f47d84708b53ead7707b0828038da5c305d2f..95d428bf45a4253503a2f2baabfa6dd6cbeb2e2c 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
+#include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -116,21 +117,9 @@ CoreOobeHandler::~CoreOobeHandler() {
 
 void CoreOobeHandler::GetLocalizedSettings(DictionaryValue* localized_strings) {
   // OOBE title is not actually seen in UI, use title of the welcome screen.
-  // TODO(altimofeev): move the strings to the corresponding handlers, when
-  // they will be ready.
-  localized_strings->SetString("title",
-                    l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
   localized_strings->SetString("welcomeScreenTitle",

[Nikita (slow), 2011/06/08 08:21:23]

Move this string to network screen handler.

[whywhat, 2011/06/08 08:29:57]

Done.

                     l10n_util::GetStringFUTF16(IDS_WELCOME_SCREEN_TITLE,
                         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
-  localized_strings->SetString("languageSelect",
-                    l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT));
-  localized_strings->SetString("keyboardSelect",
-                    l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT));
-  localized_strings->SetString("networkSelect",
-                    l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
-  localized_strings->SetString("continue",
-      l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
 }
 
 void CoreOobeHandler::Initialize() {
@@ -156,6 +145,10 @@ OobeUI::OobeUI(TabContents* contents)
 
   AddOobeMessageHandler(new CoreOobeHandler(this), localized_strings.get());
 
+  NetworkScreenHandler* network_screen_handler = new NetworkScreenHandler;
+  network_screen_actor_ = network_screen_handler;
+  AddOobeMessageHandler(network_screen_handler, localized_strings.get());
+
   EulaScreenHandler* eula_screen_handler = new EulaScreenHandler;
   eula_screen_actor_ = eula_screen_handler;
   AddOobeMessageHandler(eula_screen_handler, localized_strings.get());
@@ -213,10 +206,9 @@ void OobeUI::AddOobeMessageHandler(OobeMessageHandler* handler,
 }
 
 void OobeUI::InitializeHandlers() {
-  std::vector<WebUIMessageHandler*>::iterator iter;
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
-  for (iter = handlers_.begin() + 1; iter != handlers_.end(); ++iter) {
-    (static_cast<OobeMessageHandler*>(*iter))->Initialize();
+  for (size_t i = 1; i < handlers_.size(); ++i) {
+    static_cast<OobeMessageHandler*>(handlers_[i])->Initialize();
   }
 }