Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5320)

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 7121013: Initial implementation of network screen WebUI handler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed browser tests Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..fe51e69c03243b8becbdb757e685fb1be7c7913e 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"
@@ -156,6 +157,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 +218,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();
}
}

Powered by Google App Engine
This is Rietveld 408576698