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

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

Issue 9026017: Move some more files into ash... this time seed the window manager dir. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/aura_shell/stacking_controller.h" 5 #include "ash/wm/stacking_controller.h"
6 6
7 #include "ash/wm/always_on_top_controller.h"
7 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
8 #include "ui/aura/root_window.h" 9 #include "ui/aura/root_window.h"
9 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
10 #include "ui/aura_shell/always_on_top_controller.h"
11 #include "ui/aura_shell/shell.h" 11 #include "ui/aura_shell/shell.h"
12 #include "ui/aura_shell/shell_window_ids.h" 12 #include "ui/aura_shell/shell_window_ids.h"
13 13
14 namespace aura_shell { 14 namespace aura_shell {
15 namespace internal { 15 namespace internal {
16 namespace { 16 namespace {
17 17
18 aura::Window* GetContainer(int id) { 18 aura::Window* GetContainer(int id) {
19 return Shell::GetInstance()->GetContainer(id); 19 return Shell::GetInstance()->GetContainer(id);
20 } 20 }
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 if (window_container_id < lock_container_id) 85 if (window_container_id < lock_container_id)
86 container = GetContainer(internal::kShellWindowId_ModalContainer); 86 container = GetContainer(internal::kShellWindowId_ModalContainer);
87 else 87 else
88 container = GetContainer(internal::kShellWindowId_LockModalContainer); 88 container = GetContainer(internal::kShellWindowId_LockModalContainer);
89 89
90 return container; 90 return container;
91 } 91 }
92 92
93 } // namespace internal 93 } // namespace internal
94 } // namespace aura_shell 94 } // namespace aura_shell
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698