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

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

Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (removed some more wm_window.h) 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/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/public/cpp/shell_window_ids.h" 10 #include "ash/public/cpp/shell_window_ids.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_port.h" 12 #include "ash/shell_port.h"
13 #include "ash/window_user_data.h" 13 #include "ash/window_user_data.h"
14 #include "ash/wm/container_finder.h" 14 #include "ash/wm/container_finder.h"
15 #include "ash/wm/window_dimmer.h" 15 #include "ash/wm/window_dimmer.h"
16 #include "ash/wm/window_state.h" 16 #include "ash/wm/window_state.h"
17 #include "ash/wm_window.h"
18 #include "base/auto_reset.h" 17 #include "base/auto_reset.h"
19 #include "base/logging.h" 18 #include "base/logging.h"
20 #include "base/memory/ptr_util.h" 19 #include "base/memory/ptr_util.h"
21 #include "ui/aura/window.h" 20 #include "ui/aura/window.h"
22 #include "ui/aura/window_observer.h" 21 #include "ui/aura/window_observer.h"
23 #include "ui/wm/core/window_util.h" 22 #include "ui/wm/core/window_util.h"
24 23
25 namespace ash { 24 namespace ash {
26 namespace { 25 namespace {
27 26
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 return; 328 return;
330 329
331 WindowDimmer* window_dimmer = window_dimmers_->Get(container); 330 WindowDimmer* window_dimmer = window_dimmers_->Get(container);
332 if (window_dimmer) { 331 if (window_dimmer) {
333 base::AutoReset<bool> auto_reset(&in_restacking_, true); 332 base::AutoReset<bool> auto_reset(&in_restacking_, true);
334 container->StackChildAtBottom(window_dimmer->window()); 333 container->StackChildAtBottom(window_dimmer->window());
335 } 334 }
336 } 335 }
337 336
338 } // namespace ash 337 } // 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