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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_display_host.cc

Issue 8854007: Add checks to delegate in SigninScreenHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/login/webui_login_display_host.h" 5 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chromeos/login/oobe_display.h" 8 #include "chrome/browser/chromeos/login/oobe_display.h"
9 #include "chrome/browser/chromeos/login/webui_login_display.h" 9 #include "chrome/browser/chromeos/login/webui_login_display.h"
10 #include "chrome/browser/chromeos/login/webui_login_view.h" 10 #include "chrome/browser/chromeos/login/webui_login_view.h"
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 LoadURL(GURL(kOobeURL)); 106 LoadURL(GURL(kOobeURL));
107 107
108 BaseLoginDisplayHost::StartWizard(first_screen_name, start_url); 108 BaseLoginDisplayHost::StartWizard(first_screen_name, start_url);
109 } 109 }
110 110
111 void WebUILoginDisplayHost::StartSignInScreen() { 111 void WebUILoginDisplayHost::StartSignInScreen() {
112 if (!login_window_) 112 if (!login_window_)
113 LoadURL(GURL(kLoginURL)); 113 LoadURL(GURL(kLoginURL));
114 114
115 BaseLoginDisplayHost::StartSignInScreen(); 115 BaseLoginDisplayHost::StartSignInScreen();
116 CHECK(webui_login_display_);
116 GetOobeUI()->ShowSigninScreen(webui_login_display_); 117 GetOobeUI()->ShowSigninScreen(webui_login_display_);
117 } 118 }
118 119
119 void WebUILoginDisplayHost::LoadURL(const GURL& url) { 120 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
120 if (!login_window_) { 121 if (!login_window_) {
121 views::Widget::InitParams params( 122 views::Widget::InitParams params(
122 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); 123 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
123 params.bounds = background_bounds(); 124 params.bounds = background_bounds();
124 125
125 login_window_ = new views::Widget; 126 login_window_ = new views::Widget;
(...skipping 24 matching lines...) Expand all
150 return static_cast<OobeUI*>(login_view_->GetWebUI()); 151 return static_cast<OobeUI*>(login_view_->GetWebUI());
151 } 152 }
152 153
153 WizardController* WebUILoginDisplayHost::CreateWizardController() { 154 WizardController* WebUILoginDisplayHost::CreateWizardController() {
154 // TODO(altimofeev): ensure that WebUI is ready. 155 // TODO(altimofeev): ensure that WebUI is ready.
155 OobeDisplay* oobe_display = GetOobeUI(); 156 OobeDisplay* oobe_display = GetOobeUI();
156 return new WizardController(this, oobe_display); 157 return new WizardController(this, oobe_display);
157 } 158 }
158 159
159 } // namespace chromeos 160 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698