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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/screen_dimmer_unittest.cc ('k') | ash/wm/screen_pinning_controller_unittest.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/common/wm_shell.h"
11 #include "ash/common/wm_window.h"
12 #include "ash/common/wm_window_user_data.h"
10 #include "ash/display/window_tree_host_manager.h" 13 #include "ash/display/window_tree_host_manager.h"
11 #include "ash/public/cpp/shell_window_ids.h" 14 #include "ash/public/cpp/shell_window_ids.h"
12 #include "ash/wm/container_finder.h" 15 #include "ash/wm/container_finder.h"
13 #include "ash/wm/window_dimmer.h" 16 #include "ash/wm/window_dimmer.h"
14 #include "ash/wm/window_state.h" 17 #include "ash/wm/window_state.h"
15 #include "ash/wm_shell.h"
16 #include "ash/wm_window.h"
17 #include "ash/wm_window_user_data.h"
18 #include "base/auto_reset.h" 18 #include "base/auto_reset.h"
19 #include "base/logging.h" 19 #include "base/logging.h"
20 #include "base/memory/ptr_util.h" 20 #include "base/memory/ptr_util.h"
21 #include "ui/aura/window_observer.h" 21 #include "ui/aura/window_observer.h"
22 22
23 namespace ash { 23 namespace ash {
24 namespace { 24 namespace {
25 25
26 // Returns a list of WmWindows corresponding to SystemModalContainers, 26 // Returns a list of WmWindows corresponding to SystemModalContainers,
27 // except ones whose root is shared with |pinned_window|. 27 // except ones whose root is shared with |pinned_window|.
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 return; 336 return;
337 337
338 WindowDimmer* window_dimmer = window_dimmers_->Get(container); 338 WindowDimmer* window_dimmer = window_dimmers_->Get(container);
339 if (window_dimmer) { 339 if (window_dimmer) {
340 base::AutoReset<bool> auto_reset(&in_restacking_, true); 340 base::AutoReset<bool> auto_reset(&in_restacking_, true);
341 container->StackChildAtBottom(window_dimmer->window()); 341 container->StackChildAtBottom(window_dimmer->window());
342 } 342 }
343 } 343 }
344 344
345 } // namespace ash 345 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/screen_dimmer_unittest.cc ('k') | ash/wm/screen_pinning_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698