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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 7111033: Ties up OOBE controllers and WebUI handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: only one login window 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/chromeos/login/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 7d0004c343f148d0c5e6ac09a3522c045f300296..582b900dc9e1317165426e509d0ef41446251322 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -12,6 +12,7 @@
#include "chrome/browser/chromeos/wm_ipc.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/views/dom_view.h"
+#include "content/browser/tab_contents/tab_contents.h"
namespace {
@@ -32,15 +33,12 @@ WebUILoginView::WebUILoginView()
WebUILoginView::~WebUILoginView() {
}
-void WebUILoginView::Init(const GURL& login_url) {
- CHECK(!login_url.is_empty());
-
+void WebUILoginView::Init() {
profile_ = ProfileManager::GetDefaultProfile();
webui_login_ = new DOMView();
AddChildView(webui_login_);
webui_login_->Init(profile_, NULL);
- webui_login_->LoadURL(login_url);
webui_login_->SetVisible(true);
Nikita (slow) 2011/06/07 16:18:06 Ryan, does this call is needed? I think that DOMVi
InitStatusArea();
@@ -72,6 +70,14 @@ void WebUILoginView::UpdateWindowType() {
&params);
}
+void WebUILoginView::LoadURL(const GURL & url) {
+ webui_login_->LoadURL(url);
+}
+
+WebUI* WebUILoginView::GetWebUI() {
+ return webui_login_->tab_contents()->web_ui();
+}
+
// WebUILoginView protected: ---------------------------------------------------
void WebUILoginView::Layout() {

Powered by Google App Engine
This is Rietveld 408576698