OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
6 | 6 |
7 #include "ash/caps_lock_delegate_stub.h" | 7 #include "ash/caps_lock_delegate_stub.h" |
8 #include "ash/host/root_window_host_factory.h" | 8 #include "ash/host/root_window_host_factory.h" |
9 #include "ash/shell/example_factory.h" | 9 #include "ash/shell/example_factory.h" |
10 #include "ash/shell/launcher_delegate_impl.h" | 10 #include "ash/shell/launcher_delegate_impl.h" |
11 #include "ash/shell/context_menu.h" | 11 #include "ash/shell/context_menu.h" |
12 #include "ash/shell/toplevel_window.h" | 12 #include "ash/shell/toplevel_window.h" |
13 #include "ash/shell_window_ids.h" | 13 #include "ash/shell_window_ids.h" |
| 14 #include "ash/wm/stacking_controller.h" |
14 #include "ash/wm/window_util.h" | 15 #include "ash/wm/window_util.h" |
15 #include "base/message_loop.h" | 16 #include "base/message_loop.h" |
16 #include "ui/aura/window.h" | 17 #include "ui/aura/window.h" |
17 | 18 |
18 namespace ash { | 19 namespace ash { |
19 namespace shell { | 20 namespace shell { |
20 | 21 |
21 ShellDelegateImpl::ShellDelegateImpl() | 22 ShellDelegateImpl::ShellDelegateImpl() |
22 : watcher_(NULL), | 23 : watcher_(NULL), |
23 launcher_delegate_(NULL), | 24 launcher_delegate_(NULL), |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 } | 208 } |
208 | 209 |
209 double ShellDelegateImpl::GetSavedScreenMagnifierScale() { | 210 double ShellDelegateImpl::GetSavedScreenMagnifierScale() { |
210 return std::numeric_limits<double>::min(); | 211 return std::numeric_limits<double>::min(); |
211 } | 212 } |
212 | 213 |
213 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) { | 214 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(aura::RootWindow* root) { |
214 return new ContextMenu(root); | 215 return new ContextMenu(root); |
215 } | 216 } |
216 | 217 |
| 218 aura::client::StackingClient* ShellDelegateImpl::CreateStackingClient() { |
| 219 return new StackingController; |
| 220 } |
| 221 |
217 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { | 222 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { |
218 return RootWindowHostFactory::Create(); | 223 return RootWindowHostFactory::Create(); |
219 } | 224 } |
220 | 225 |
221 } // namespace shell | 226 } // namespace shell |
222 } // namespace ash | 227 } // namespace ash |
OLD | NEW |