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/test/test_shell_delegate.h" | 5 #include "ash/test/test_shell_delegate.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/caps_lock_delegate_stub.h" | 9 #include "ash/caps_lock_delegate_stub.h" |
10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
11 #include "ash/shell_window_ids.h" | 11 #include "ash/shell_window_ids.h" |
12 #include "ash/test/test_launcher_delegate.h" | 12 #include "ash/test/test_launcher_delegate.h" |
| 13 #include "ash/wm/stacking_controller.h" |
13 #include "ash/wm/window_util.h" | 14 #include "ash/wm/window_util.h" |
14 #include "content/public/test/test_browser_context.h" | 15 #include "content/public/test/test_browser_context.h" |
15 #include "ui/aura/window.h" | 16 #include "ui/aura/window.h" |
16 | 17 |
17 namespace ash { | 18 namespace ash { |
18 namespace test { | 19 namespace test { |
19 | 20 |
20 TestShellDelegate::TestShellDelegate() | 21 TestShellDelegate::TestShellDelegate() |
21 : locked_(false), | 22 : locked_(false), |
22 spoken_feedback_enabled_(false), | 23 spoken_feedback_enabled_(false), |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 } | 153 } |
153 | 154 |
154 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) { | 155 ui::MenuModel* TestShellDelegate::CreateContextMenu(aura::RootWindow* root) { |
155 return NULL; | 156 return NULL; |
156 } | 157 } |
157 | 158 |
158 double TestShellDelegate::GetSavedScreenMagnifierScale() { | 159 double TestShellDelegate::GetSavedScreenMagnifierScale() { |
159 return std::numeric_limits<double>::min(); | 160 return std::numeric_limits<double>::min(); |
160 } | 161 } |
161 | 162 |
| 163 aura::client::StackingClient* TestShellDelegate::CreateStackingClient() { |
| 164 return new StackingController; |
| 165 } |
| 166 |
162 } // namespace test | 167 } // namespace test |
163 } // namespace ash | 168 } // namespace ash |
OLD | NEW |