| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h" | 10 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_helper.h" |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 | 182 |
| 183 login_window_->SetContentsView(login_view_); | 183 login_window_->SetContentsView(login_view_); |
| 184 login_view_->UpdateWindowType(); | 184 login_view_->UpdateWindowType(); |
| 185 | 185 |
| 186 login_window_->Show(); | 186 login_window_->Show(); |
| 187 #if defined(USE_AURA) | 187 #if defined(USE_AURA) |
| 188 login_window_->GetNativeView()->SetName("WebUILoginView"); | 188 login_window_->GetNativeView()->SetName("WebUILoginView"); |
| 189 #endif | 189 #endif |
| 190 login_view_->OnWindowCreated(); | 190 login_view_->OnWindowCreated(); |
| 191 } | 191 } |
| 192 // crosbug.com/26646. |
| 193 LOG(WARNING) << "LoadURL:" << url; |
| 192 login_view_->LoadURL(url); | 194 login_view_->LoadURL(url); |
| 193 } | 195 } |
| 194 | 196 |
| 195 OobeUI* WebUILoginDisplayHost::GetOobeUI() const { | 197 OobeUI* WebUILoginDisplayHost::GetOobeUI() const { |
| 196 return static_cast<OobeUI*>(login_view_->GetWebUI()->GetController()); | 198 return static_cast<OobeUI*>(login_view_->GetWebUI()->GetController()); |
| 197 } | 199 } |
| 198 | 200 |
| 199 WizardController* WebUILoginDisplayHost::CreateWizardController() { | 201 WizardController* WebUILoginDisplayHost::CreateWizardController() { |
| 200 // TODO(altimofeev): ensure that WebUI is ready. | 202 // TODO(altimofeev): ensure that WebUI is ready. |
| 201 OobeDisplay* oobe_display = GetOobeUI(); | 203 OobeDisplay* oobe_display = GetOobeUI(); |
| 202 return new WizardController(this, oobe_display); | 204 return new WizardController(this, oobe_display); |
| 203 } | 205 } |
| 204 | 206 |
| 205 } // namespace chromeos | 207 } // namespace chromeos |
| OLD | NEW |