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

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

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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
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"
11 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
12 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 12 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
13 #include "views/widget/widget.h" 13 #include "ui/views/widget/widget.h"
14 14
15 #if defined(USE_AURA) 15 #if defined(USE_AURA)
16 #include "ui/aura/window.h" 16 #include "ui/aura/window.h"
17 #include "ui/aura_shell/shell.h" 17 #include "ui/aura_shell/shell.h"
18 #include "ui/aura_shell/shell_window_ids.h" 18 #include "ui/aura_shell/shell_window_ids.h"
19 #endif 19 #endif
20 20
21 namespace chromeos { 21 namespace chromeos {
22 22
23 namespace { 23 namespace {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_display.cc ('k') | chrome/browser/chromeos/login/webui_login_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698