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

Side by Side Diff: ash/login/ui/lock_screen.cc

Issue 2867173003: cros: Move LockWindow from chrome to ash (Closed)
Patch Set: Reorder patches so view -> ui lands first Created 3 years, 7 months 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
« no previous file with comments | « ash/login/ui/lock_screen.h ('k') | ash/login/ui/lock_window.h » ('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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "ash/login/ui/lock_screen.h" 5 #include "ash/login/ui/lock_screen.h"
6 6
7 #include "ash/login/ui/lock_contents_view.h" 7 #include "ash/login/ui/lock_contents_view.h"
8 #include "ash/login/ui/lock_window.h"
9 #include "ui/display/display.h"
10 #include "ui/display/screen.h"
8 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
9 12
10 namespace ash { 13 namespace ash {
11 14
12 void ShowLockScreenInWidget(views::Widget* widget) { 15 bool ShowLockScreen() {
16 LockWindow* window = new LockWindow();
17 window->SetBounds(display::Screen::GetScreen()->GetPrimaryDisplay().bounds());
18
13 views::View* contents = new LockContentsView(); 19 views::View* contents = new LockContentsView();
14 widget->SetContentsView(contents); 20 window->SetContentsView(contents);
15 widget->Show(); 21 window->Show();
22
23 return true;
16 } 24 }
17 25
18 } // namespace ash 26 } // namespace ash
OLDNEW
« no previous file with comments | « ash/login/ui/lock_screen.h ('k') | ash/login/ui/lock_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698