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 <limits> | 7 #include <limits> |
8 | 8 |
9 #include "ash/app_list/app_list_presenter_delegate.h" | 9 #include "ash/app_list/app_list_presenter_delegate.h" |
10 #include "ash/app_list/app_list_presenter_delegate_factory.h" | 10 #include "ash/app_list/app_list_presenter_delegate_factory.h" |
| 11 #include "ash/container_delegate_aura.h" |
11 #include "ash/default_accessibility_delegate.h" | 12 #include "ash/default_accessibility_delegate.h" |
12 #include "ash/gpu_support_stub.h" | 13 #include "ash/gpu_support_stub.h" |
13 #include "ash/media_delegate.h" | 14 #include "ash/media_delegate.h" |
14 #include "ash/new_window_delegate.h" | 15 #include "ash/new_window_delegate.h" |
15 #include "ash/pointer_watcher_delegate_aura.h" | 16 #include "ash/pointer_watcher_delegate_aura.h" |
16 #include "ash/session/session_state_delegate.h" | 17 #include "ash/session/session_state_delegate.h" |
17 #include "ash/shell.h" | 18 #include "ash/shell.h" |
18 #include "ash/shell_window_ids.h" | 19 #include "ash/shell_window_ids.h" |
19 #include "ash/test/test_keyboard_ui.h" | 20 #include "ash/test/test_keyboard_ui.h" |
20 #include "ash/test/test_session_state_delegate.h" | 21 #include "ash/test/test_session_state_delegate.h" |
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 } | 199 } |
199 | 200 |
200 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { | 201 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { |
201 return new NewWindowDelegateImpl; | 202 return new NewWindowDelegateImpl; |
202 } | 203 } |
203 | 204 |
204 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 205 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { |
205 return new MediaDelegateImpl; | 206 return new MediaDelegateImpl; |
206 } | 207 } |
207 | 208 |
| 209 std::unique_ptr<ash::ContainerDelegate> |
| 210 TestShellDelegate::CreateContainerDelegate() { |
| 211 return base::WrapUnique(new ContainerDelegateAura); |
| 212 } |
| 213 |
208 std::unique_ptr<PointerWatcherDelegate> | 214 std::unique_ptr<PointerWatcherDelegate> |
209 TestShellDelegate::CreatePointerWatcherDelegate() { | 215 TestShellDelegate::CreatePointerWatcherDelegate() { |
210 return base::WrapUnique(new PointerWatcherDelegateAura); | 216 return base::WrapUnique(new PointerWatcherDelegateAura); |
211 } | 217 } |
212 | 218 |
213 ui::MenuModel* TestShellDelegate::CreateContextMenu( | 219 ui::MenuModel* TestShellDelegate::CreateContextMenu( |
214 ash::Shelf* shelf, | 220 ash::Shelf* shelf, |
215 const ash::ShelfItem* item) { | 221 const ash::ShelfItem* item) { |
216 return nullptr; | 222 return nullptr; |
217 } | 223 } |
(...skipping 15 matching lines...) Expand all Loading... |
233 #if defined(OS_CHROMEOS) | 239 #if defined(OS_CHROMEOS) |
234 Shell* shell = Shell::GetInstance(); | 240 Shell* shell = Shell::GetInstance(); |
235 static_cast<MediaDelegateImpl*>(shell->media_delegate()) | 241 static_cast<MediaDelegateImpl*>(shell->media_delegate()) |
236 ->set_media_capture_state(state); | 242 ->set_media_capture_state(state); |
237 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); | 243 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); |
238 #endif | 244 #endif |
239 } | 245 } |
240 | 246 |
241 } // namespace test | 247 } // namespace test |
242 } // namespace ash | 248 } // namespace ash |
OLD | NEW |