| 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/common/default_accessibility_delegate.h" | 11 #include "ash/common/default_accessibility_delegate.h" |
| 12 #include "ash/common/gpu_support_stub.h" | 12 #include "ash/common/gpu_support_stub.h" |
| 13 #include "ash/common/media_delegate.h" | 13 #include "ash/common/media_delegate.h" |
| 14 #include "ash/common/new_window_delegate.h" | 14 #include "ash/common/new_window_delegate.h" |
| 15 #include "ash/common/palette_delegate.h" | 15 #include "ash/common/palette_delegate.h" |
| 16 #include "ash/common/session/session_state_delegate.h" | 16 #include "ash/common/session/session_state_delegate.h" |
| 17 #include "ash/common/shell_window_ids.h" | 17 #include "ash/common/shell_window_ids.h" |
| 18 #include "ash/common/wm/window_state.h" | 18 #include "ash/common/wm/window_state.h" |
| 19 #include "ash/common/wm_shell.h" | 19 #include "ash/common/wm_shell.h" |
| 20 #include "ash/test/test_keyboard_ui.h" | 20 #include "ash/test/test_keyboard_ui.h" |
| 21 #include "ash/test/test_session_state_delegate.h" | 21 #include "ash/test/test_session_state_delegate.h" |
| 22 #include "ash/test/test_shelf_delegate.h" | 22 #include "ash/test/test_shelf_delegate.h" |
| 23 #include "ash/test/test_system_tray_delegate.h" | 23 #include "ash/test/test_system_tray_delegate.h" |
| 24 #include "ash/test/test_user_wallpaper_delegate.h" | 24 #include "ash/test/test_wallpaper_delegate.h" |
| 25 #include "ash/wm/window_util.h" | 25 #include "ash/wm/window_util.h" |
| 26 #include "base/logging.h" | 26 #include "base/logging.h" |
| 27 #include "base/memory/ptr_util.h" | 27 #include "base/memory/ptr_util.h" |
| 28 #include "ui/app_list/presenter/app_list_presenter_impl.h" | 28 #include "ui/app_list/presenter/app_list_presenter_impl.h" |
| 29 #include "ui/app_list/presenter/app_list_view_delegate_factory.h" | 29 #include "ui/app_list/presenter/app_list_view_delegate_factory.h" |
| 30 #include "ui/app_list/test/app_list_test_view_delegate.h" | 30 #include "ui/app_list/test/app_list_test_view_delegate.h" |
| 31 #include "ui/aura/window.h" | 31 #include "ui/aura/window.h" |
| 32 #include "ui/gfx/image/image.h" | 32 #include "ui/gfx/image/image.h" |
| 33 | 33 |
| 34 #if defined(OS_CHROMEOS) | 34 #if defined(OS_CHROMEOS) |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 159 } | 159 } |
| 160 | 160 |
| 161 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { | 161 ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) { |
| 162 return new TestShelfDelegate(model); | 162 return new TestShelfDelegate(model); |
| 163 } | 163 } |
| 164 | 164 |
| 165 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { | 165 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { |
| 166 return new TestSystemTrayDelegate; | 166 return new TestSystemTrayDelegate; |
| 167 } | 167 } |
| 168 | 168 |
| 169 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { | 169 std::unique_ptr<WallpaperDelegate> |
| 170 return new TestUserWallpaperDelegate(); | 170 TestShellDelegate::CreateWallpaperDelegate() { |
| 171 return base::MakeUnique<TestWallpaperDelegate>(); |
| 171 } | 172 } |
| 172 | 173 |
| 173 TestSessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() { | 174 TestSessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() { |
| 174 return new TestSessionStateDelegate(); | 175 return new TestSessionStateDelegate(); |
| 175 } | 176 } |
| 176 | 177 |
| 177 AccessibilityDelegate* TestShellDelegate::CreateAccessibilityDelegate() { | 178 AccessibilityDelegate* TestShellDelegate::CreateAccessibilityDelegate() { |
| 178 return new DefaultAccessibilityDelegate(); | 179 return new DefaultAccessibilityDelegate(); |
| 179 } | 180 } |
| 180 | 181 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 211 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
| 212 #if defined(OS_CHROMEOS) | 213 #if defined(OS_CHROMEOS) |
| 213 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) | 214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) |
| 214 ->set_media_capture_state(state); | 215 ->set_media_capture_state(state); |
| 215 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); | 216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 216 #endif | 217 #endif |
| 217 } | 218 } |
| 218 | 219 |
| 219 } // namespace test | 220 } // namespace test |
| 220 } // namespace ash | 221 } // namespace ash |
| OLD | NEW |