| OLD | NEW |
| 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 aura_shell::Shell::GetInstance()->GetContainer( | 132 aura_shell::Shell::GetInstance()->GetContainer( |
| 133 aura_shell::internal::kShellWindowId_LockScreenContainer)-> | 133 aura_shell::internal::kShellWindowId_LockScreenContainer)-> |
| 134 AddChild(login_window_->GetNativeView()); | 134 AddChild(login_window_->GetNativeView()); |
| 135 #endif | 135 #endif |
| 136 | 136 |
| 137 login_window_->SetContentsView(login_view_); | 137 login_window_->SetContentsView(login_view_); |
| 138 login_view_->UpdateWindowType(); | 138 login_view_->UpdateWindowType(); |
| 139 | 139 |
| 140 login_window_->Show(); | 140 login_window_->Show(); |
| 141 #if defined(USE_AURA) | 141 #if defined(USE_AURA) |
| 142 login_window_->GetNativeView()->set_name("WebUILoginView"); | 142 login_window_->GetNativeView()->SetName("WebUILoginView"); |
| 143 #endif | 143 #endif |
| 144 login_view_->OnWindowCreated(); | 144 login_view_->OnWindowCreated(); |
| 145 } | 145 } |
| 146 login_view_->LoadURL(url); | 146 login_view_->LoadURL(url); |
| 147 } | 147 } |
| 148 | 148 |
| 149 OobeUI* WebUILoginDisplayHost::GetOobeUI() const { | 149 OobeUI* WebUILoginDisplayHost::GetOobeUI() const { |
| 150 return static_cast<OobeUI*>(login_view_->GetWebUI()); | 150 return static_cast<OobeUI*>(login_view_->GetWebUI()); |
| 151 } | 151 } |
| 152 | 152 |
| 153 WizardController* WebUILoginDisplayHost::CreateWizardController() { | 153 WizardController* WebUILoginDisplayHost::CreateWizardController() { |
| 154 // TODO(altimofeev): ensure that WebUI is ready. | 154 // TODO(altimofeev): ensure that WebUI is ready. |
| 155 OobeDisplay* oobe_display = GetOobeUI(); | 155 OobeDisplay* oobe_display = GetOobeUI(); |
| 156 return new WizardController(this, oobe_display); | 156 return new WizardController(this, oobe_display); |
| 157 } | 157 } |
| 158 | 158 |
| 159 } // namespace chromeos | 159 } // namespace chromeos |
| OLD | NEW |