| 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/session/session_state_delegate.h" | 16 #include "ash/common/session/session_state_delegate.h" |
| 16 #include "ash/common/shell_window_ids.h" | 17 #include "ash/common/shell_window_ids.h" |
| 17 #include "ash/common/wm/window_state.h" | 18 #include "ash/common/wm/window_state.h" |
| 18 #include "ash/common/wm_shell.h" | 19 #include "ash/common/wm_shell.h" |
| 19 #include "ash/pointer_watcher_delegate_aura.h" | 20 #include "ash/pointer_watcher_delegate_aura.h" |
| 20 #include "ash/test/test_keyboard_ui.h" | 21 #include "ash/test/test_keyboard_ui.h" |
| 21 #include "ash/test/test_session_state_delegate.h" | 22 #include "ash/test/test_session_state_delegate.h" |
| 22 #include "ash/test/test_shelf_delegate.h" | 23 #include "ash/test/test_shelf_delegate.h" |
| 23 #include "ash/test/test_system_tray_delegate.h" | 24 #include "ash/test/test_system_tray_delegate.h" |
| 24 #include "ash/test/test_user_wallpaper_delegate.h" | 25 #include "ash/test/test_user_wallpaper_delegate.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 } | 180 } |
| 180 | 181 |
| 181 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { | 182 NewWindowDelegate* TestShellDelegate::CreateNewWindowDelegate() { |
| 182 return new NewWindowDelegateImpl; | 183 return new NewWindowDelegateImpl; |
| 183 } | 184 } |
| 184 | 185 |
| 185 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { | 186 MediaDelegate* TestShellDelegate::CreateMediaDelegate() { |
| 186 return new MediaDelegateImpl; | 187 return new MediaDelegateImpl; |
| 187 } | 188 } |
| 188 | 189 |
| 190 std::unique_ptr<PaletteDelegate> TestShellDelegate::CreatePaletteDelegate() { |
| 191 return nullptr; |
| 192 } |
| 193 |
| 189 std::unique_ptr<PointerWatcherDelegate> | 194 std::unique_ptr<PointerWatcherDelegate> |
| 190 TestShellDelegate::CreatePointerWatcherDelegate() { | 195 TestShellDelegate::CreatePointerWatcherDelegate() { |
| 191 return base::WrapUnique(new PointerWatcherDelegateAura); | 196 return base::WrapUnique(new PointerWatcherDelegateAura); |
| 192 } | 197 } |
| 193 | 198 |
| 194 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf, | 199 ui::MenuModel* TestShellDelegate::CreateContextMenu(WmShelf* wm_shelf, |
| 195 const ShelfItem* item) { | 200 const ShelfItem* item) { |
| 196 return nullptr; | 201 return nullptr; |
| 197 } | 202 } |
| 198 | 203 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 212 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 217 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
| 213 #if defined(OS_CHROMEOS) | 218 #if defined(OS_CHROMEOS) |
| 214 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) | 219 static_cast<MediaDelegateImpl*>(WmShell::Get()->media_delegate()) |
| 215 ->set_media_capture_state(state); | 220 ->set_media_capture_state(state); |
| 216 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); | 221 WmShell::Get()->system_tray_notifier()->NotifyMediaCaptureChanged(); |
| 217 #endif | 222 #endif |
| 218 } | 223 } |
| 219 | 224 |
| 220 } // namespace test | 225 } // namespace test |
| 221 } // namespace ash | 226 } // namespace ash |
| OLD | NEW |