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

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

Issue 2430593002: mash: Use ash shell window container ids instead of ash::mojom::Container (Closed)
Patch Set: rebase 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
« no previous file with comments | « ash/wm/root_window_layout_manager_unittest.cc ('k') | ash/wm/session_state_animator.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/screen_pinning_controller.h" 5 #include "ash/wm/screen_pinning_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/aura/wm_window_aura.h" 10 #include "ash/aura/wm_window_aura.h"
11 #include "ash/common/shell_window_ids.h"
12 #include "ash/common/wm/container_finder.h" 11 #include "ash/common/wm/container_finder.h"
13 #include "ash/common/wm/window_dimmer.h" 12 #include "ash/common/wm/window_dimmer.h"
14 #include "ash/common/wm/window_state.h" 13 #include "ash/common/wm/window_state.h"
15 #include "ash/common/wm_shell.h" 14 #include "ash/common/wm_shell.h"
16 #include "ash/common/wm_window.h" 15 #include "ash/common/wm_window.h"
17 #include "ash/common/wm_window_observer.h" 16 #include "ash/common/wm_window_observer.h"
18 #include "ash/common/wm_window_user_data.h" 17 #include "ash/common/wm_window_user_data.h"
19 #include "ash/display/window_tree_host_manager.h" 18 #include "ash/display/window_tree_host_manager.h"
19 #include "ash/public/cpp/shell_window_ids.h"
20 #include "base/auto_reset.h" 20 #include "base/auto_reset.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/memory/ptr_util.h" 22 #include "base/memory/ptr_util.h"
23 #include "ui/aura/window_observer.h" 23 #include "ui/aura/window_observer.h"
24 24
25 namespace ash { 25 namespace ash {
26 namespace { 26 namespace {
27 27
28 // Returns a list of WmWindows corresponding to SystemModalContainers, 28 // Returns a list of WmWindows corresponding to SystemModalContainers,
29 // except ones whose root is shared with |pinned_window|. 29 // except ones whose root is shared with |pinned_window|.
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 return; 341 return;
342 342
343 WindowDimmer* window_dimmer = window_dimmers_->Get(container); 343 WindowDimmer* window_dimmer = window_dimmers_->Get(container);
344 if (window_dimmer) { 344 if (window_dimmer) {
345 base::AutoReset<bool> auto_reset(&in_restacking_, true); 345 base::AutoReset<bool> auto_reset(&in_restacking_, true);
346 container->StackChildAtBottom(window_dimmer->window()); 346 container->StackChildAtBottom(window_dimmer->window());
347 } 347 }
348 } 348 }
349 349
350 } // namespace ash 350 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/root_window_layout_manager_unittest.cc ('k') | ash/wm/session_state_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698