chrome/browser/chromeos/login/ui/lock_window_aura.cc - Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/login/ui/lock_window_aura.cc

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)

Patch Set: move files to ash/shared, fix deps Created 4 years, 2 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

« ash/shared/BUILD.gn ('K') | « chrome/browser/chromeos/input_method/mode_indicator_controller.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/ui/lock_window_aura.h"	5 #include "chrome/browser/chromeos/login/ui/lock_window_aura.h"

6	6

7 #include "ash/common/shell_window_ids.h"	7 #include "ash/shared/shell_window_ids.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "base/command_line.h"	9 #include "base/command_line.h"

10 #include "ui/aura/window.h"	10 #include "ui/aura/window.h"

11 #include "ui/aura/window_event_dispatcher.h"	11 #include "ui/aura/window_event_dispatcher.h"

12	12

13 namespace chromeos {	13 namespace chromeos {

14	14

15 LockWindow* LockWindow::Create() {	15 LockWindow* LockWindow::Create() {

16 LockWindowAura* lock_window = new LockWindowAura();	16 LockWindowAura* lock_window = new LockWindowAura();

17 // Cancel existing touch events when screen is locked.	17 // Cancel existing touch events when screen is locked.

(...skipping 41 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
59 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;	59 params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;

60 // TODO(oshima): move the lock screen harness to ash.	60 // TODO(oshima): move the lock screen harness to ash.

61 params.parent =	61 params.parent =

62 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),	62 ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(),

63 ash::kShellWindowId_LockScreenContainer);	63 ash::kShellWindowId_LockScreenContainer);

64 views::Widget::Init(params);	64 views::Widget::Init(params);

65 SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);	65 SetVisibilityAnimationTransition(views::Widget::ANIMATE_NONE);

66 }	66 }

67	67

68 } // namespace chromeos	68 } // namespace chromeos

OLD	NEW