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

Side by Side Diff: ash/wm/lock_action_handler_layout_manager.cc

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 6 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/wm/immersive_context_ash.cc ('k') | ash/wm/maximize_mode/maximize_mode_event_handler.cc » ('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/wm/lock_action_handler_layout_manager.h" 5 #include "ash/wm/lock_action_handler_layout_manager.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/public/cpp/shell_window_ids.h" 9 #include "ash/public/cpp/shell_window_ids.h"
10 #include "ash/public/interfaces/tray_action.mojom.h" 10 #include "ash/public/interfaces/tray_action.mojom.h"
11 #include "ash/shelf/shelf.h" 11 #include "ash/shelf/shelf.h"
12 #include "ash/shell.h" 12 #include "ash/shell.h"
13 #include "ash/tray_action/tray_action.h" 13 #include "ash/tray_action/tray_action.h"
14 #include "ash/wm/lock_window_state.h" 14 #include "ash/wm/lock_window_state.h"
15 #include "ash/wm/window_state.h" 15 #include "ash/wm/window_state.h"
16 #include "ash/wm/window_util.h" 16 #include "ash/wm/window_util.h"
17 #include "ash/wm/wm_event.h" 17 #include "ash/wm/wm_event.h"
18 #include "ash/wm_window.h"
19 18
20 namespace ash { 19 namespace ash {
21 20
22 LockActionHandlerLayoutManager::LockActionHandlerLayoutManager( 21 LockActionHandlerLayoutManager::LockActionHandlerLayoutManager(
23 aura::Window* window, 22 aura::Window* window,
24 Shelf* shelf) 23 Shelf* shelf)
25 : LockLayoutManager(window), 24 : LockLayoutManager(window),
26 shelf_observer_(this), 25 shelf_observer_(this),
27 tray_action_observer_(this) { 26 tray_action_observer_(this) {
28 TrayAction* tray_action = Shell::Get()->tray_action(); 27 TrayAction* tray_action = Shell::Get()->tray_action();
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 } 90 }
92 } 91 }
93 92
94 if (!window()->children().empty() && 93 if (!window()->children().empty() &&
95 state == mojom::TrayActionState::kActive) { 94 state == mojom::TrayActionState::kActive) {
96 wm::ActivateWindow(window()->children().back()); 95 wm::ActivateWindow(window()->children().back());
97 } 96 }
98 } 97 }
99 98
100 } // namespace ash 99 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/immersive_context_ash.cc ('k') | ash/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698