| 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/app_list/app_list_view_delegate_factory.h" | 11 #include "ash/app_list/app_list_view_delegate_factory.h" | 
| 12 #include "ash/default_accessibility_delegate.h" | 12 #include "ash/default_accessibility_delegate.h" | 
| 13 #include "ash/gpu_support_stub.h" | 13 #include "ash/gpu_support_stub.h" | 
| 14 #include "ash/media_delegate.h" | 14 #include "ash/media_delegate.h" | 
| 15 #include "ash/new_window_delegate.h" | 15 #include "ash/new_window_delegate.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" | 
| 21 #include "ash/test/test_shelf_delegate.h" | 22 #include "ash/test/test_shelf_delegate.h" | 
| 22 #include "ash/test/test_system_tray_delegate.h" | 23 #include "ash/test/test_system_tray_delegate.h" | 
| 23 #include "ash/test/test_user_wallpaper_delegate.h" | 24 #include "ash/test/test_user_wallpaper_delegate.h" | 
| 24 #include "ash/wm/window_state.h" | 25 #include "ash/wm/window_state.h" | 
| 25 #include "ash/wm/window_util.h" | 26 #include "ash/wm/window_util.h" | 
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 196 } | 197 } | 
| 197 | 198 | 
| 198 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { | 199 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { | 
| 199   return new NewWindowDelegateImpl; | 200   return new NewWindowDelegateImpl; | 
| 200 } | 201 } | 
| 201 | 202 | 
| 202 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 203 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 
| 203   return new MediaDelegateImpl; | 204   return new MediaDelegateImpl; | 
| 204 } | 205 } | 
| 205 | 206 | 
|  | 207 std::unique_ptr<PointerWatcherDelegate> | 
|  | 208 TestShellDelegate::CreatePointerWatcherDelegate() { | 
|  | 209   return base::WrapUnique(new PointerWatcherDelegateAura); | 
|  | 210 } | 
|  | 211 | 
| 206 ui::MenuModel* TestShellDelegate::CreateContextMenu( | 212 ui::MenuModel* TestShellDelegate::CreateContextMenu( | 
| 207     ash::Shelf* shelf, | 213     ash::Shelf* shelf, | 
| 208     const ash::ShelfItem* item) { | 214     const ash::ShelfItem* item) { | 
| 209   return nullptr; | 215   return nullptr; | 
| 210 } | 216 } | 
| 211 | 217 | 
| 212 GPUSupport* TestShellDelegate::CreateGPUSupport() { | 218 GPUSupport* TestShellDelegate::CreateGPUSupport() { | 
| 213   // Real GPU support depends on src/content, so just use a stub. | 219   // Real GPU support depends on src/content, so just use a stub. | 
| 214   return new GPUSupportStub; | 220   return new GPUSupportStub; | 
| 215 } | 221 } | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 226 #if defined(OS_CHROMEOS) | 232 #if defined(OS_CHROMEOS) | 
| 227   Shell* shell = Shell::GetInstance(); | 233   Shell* shell = Shell::GetInstance(); | 
| 228   static_cast<MediaDelegateImpl*>(shell->media_delegate()) | 234   static_cast<MediaDelegateImpl*>(shell->media_delegate()) | 
| 229       ->set_media_capture_state(state); | 235       ->set_media_capture_state(state); | 
| 230   shell->system_tray_notifier()->NotifyMediaCaptureChanged(); | 236   shell->system_tray_notifier()->NotifyMediaCaptureChanged(); | 
| 231 #endif | 237 #endif | 
| 232 } | 238 } | 
| 233 | 239 | 
| 234 }  // namespace test | 240 }  // namespace test | 
| 235 }  // namespace ash | 241 }  // namespace ash | 
| OLD | NEW | 
|---|