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.h" | 5 #include "chrome/browser/chromeos/login/webui_login_display.h" |
6 | 6 |
7 #include "chrome/browser/chromeos/login/webui_login_view.h" | 7 #include "chrome/browser/chromeos/login/webui_login_view.h" |
8 #include "chrome/browser/chromeos/wm_ipc.h" | 8 #include "chrome/browser/chromeos/wm_ipc.h" |
9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 | 57 |
58 // TODO(rharrison): Add mechanism to pass in the show_guest and show_new_user | 58 // TODO(rharrison): Add mechanism to pass in the show_guest and show_new_user |
59 // values. | 59 // values. |
60 void WebUILoginDisplay::Init(const std::vector<UserManager::User>& users, | 60 void WebUILoginDisplay::Init(const std::vector<UserManager::User>& users, |
61 bool show_guest, | 61 bool show_guest, |
62 bool show_new_user) { | 62 bool show_new_user) { |
63 // Testing that the delegate has been set. | 63 // Testing that the delegate has been set. |
64 DCHECK(delegate_); | 64 DCHECK(delegate_); |
65 users_ = users; | 65 users_ = users; |
66 | 66 |
67 views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP); | 67 views::Widget::InitParams params( |
| 68 views::Widget::InitParams::TYPE_WINDOW_FRAMELESS); |
68 params.bounds = background_bounds_; | 69 params.bounds = background_bounds_; |
69 | 70 |
70 login_window_ = new views::Widget; | 71 login_window_ = new views::Widget; |
71 login_window_->Init(params); | 72 login_window_->Init(params); |
72 | 73 |
73 #if defined(TOUCH_UI) | 74 #if defined(TOUCH_UI) |
74 TouchLoginView* login_view = new TouchLoginView(); | 75 TouchLoginView* login_view = new TouchLoginView(); |
75 #else | 76 #else |
76 WebUILoginView* login_view = new WebUILoginView(); | 77 WebUILoginView* login_view = new WebUILoginView(); |
77 #endif | 78 #endif |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 | 137 |
137 // Singleton implementation: --------------------------------------------------- | 138 // Singleton implementation: --------------------------------------------------- |
138 | 139 |
139 WebUILoginDisplay::WebUILoginDisplay() | 140 WebUILoginDisplay::WebUILoginDisplay() |
140 : LoginDisplay(NULL, gfx::Rect()), | 141 : LoginDisplay(NULL, gfx::Rect()), |
141 LoginUIHandlerDelegate(), | 142 LoginUIHandlerDelegate(), |
142 login_window_(NULL) { | 143 login_window_(NULL) { |
143 } | 144 } |
144 | 145 |
145 } // namespace chromeos | 146 } // namespace chromeos |
OLD | NEW |