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/default_accessibility_delegate.h" | 9 #include "ash/default_accessibility_delegate.h" |
10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
11 #include "ash/media_delegate.h" | 11 #include "ash/media_delegate.h" |
12 #include "ash/new_window_delegate.h" | 12 #include "ash/new_window_delegate.h" |
13 #include "ash/session/session_state_delegate.h" | 13 #include "ash/session/session_state_delegate.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/shell/keyboard_controller_proxy_stub.h" | 15 #include "ash/shell/keyboard_controller_proxy_stub.h" |
16 #include "ash/shell_window_ids.h" | 16 #include "ash/shell_window_ids.h" |
17 #include "ash/test/test_session_state_delegate.h" | 17 #include "ash/test/test_session_state_delegate.h" |
18 #include "ash/test/test_shelf_delegate.h" | 18 #include "ash/test/test_shelf_delegate.h" |
19 #include "ash/test/test_system_tray_delegate.h" | 19 #include "ash/test/test_system_tray_delegate.h" |
20 #include "ash/test/test_user_wallpaper_delegate.h" | 20 #include "ash/test/test_user_wallpaper_delegate.h" |
21 #include "ash/wm/window_state.h" | 21 #include "ash/wm/window_state.h" |
22 #include "ash/wm/window_util.h" | 22 #include "ash/wm/window_util.h" |
23 #include "base/logging.h" | 23 #include "base/logging.h" |
24 #include "content/public/test/test_browser_context.h" | 24 #include "content/public/test/test_browser_context.h" |
25 #include "ui/app_list/app_list_model.h" | 25 #include "ui/app_list/app_list_model.h" |
26 #include "ui/app_list/app_list_view_delegate.h" | 26 #include "ui/app_list/app_list_view_delegate.h" |
27 #include "ui/app_list/test/app_list_test_view_delegate.h" | 27 #include "ui/app_list/test/app_list_test_view_delegate.h" |
28 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" |
| 29 #include "ui/gfx/image/image.h" |
29 | 30 |
30 #if defined(OS_CHROMEOS) | 31 #if defined(OS_CHROMEOS) |
31 #include "ash/system/tray/system_tray_notifier.h" | 32 #include "ash/system/tray/system_tray_notifier.h" |
32 #endif | 33 #endif |
33 | 34 |
34 namespace ash { | 35 namespace ash { |
35 namespace test { | 36 namespace test { |
36 namespace { | 37 namespace { |
37 | 38 |
38 class NewWindowDelegateImpl : public NewWindowDelegate { | 39 class NewWindowDelegateImpl : public NewWindowDelegate { |
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 | 193 |
193 GPUSupport* TestShellDelegate::CreateGPUSupport() { | 194 GPUSupport* TestShellDelegate::CreateGPUSupport() { |
194 // Real GPU support depends on src/content, so just use a stub. | 195 // Real GPU support depends on src/content, so just use a stub. |
195 return new GPUSupportStub; | 196 return new GPUSupportStub; |
196 } | 197 } |
197 | 198 |
198 base::string16 TestShellDelegate::GetProductName() const { | 199 base::string16 TestShellDelegate::GetProductName() const { |
199 return base::string16(); | 200 return base::string16(); |
200 } | 201 } |
201 | 202 |
| 203 gfx::Image TestShellDelegate::GetDeprecatedAcceleratorImage() const { |
| 204 return gfx::Image(); |
| 205 } |
| 206 |
202 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { | 207 void TestShellDelegate::SetMediaCaptureState(MediaCaptureState state) { |
203 #if defined(OS_CHROMEOS) | 208 #if defined(OS_CHROMEOS) |
204 Shell* shell = Shell::GetInstance(); | 209 Shell* shell = Shell::GetInstance(); |
205 static_cast<MediaDelegateImpl*>(shell->media_delegate()) | 210 static_cast<MediaDelegateImpl*>(shell->media_delegate()) |
206 ->set_media_capture_state(state); | 211 ->set_media_capture_state(state); |
207 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); | 212 shell->system_tray_notifier()->NotifyMediaCaptureChanged(); |
208 #endif | 213 #endif |
209 } | 214 } |
210 | 215 |
211 } // namespace test | 216 } // namespace test |
212 } // namespace ash | 217 } // namespace ash |
OLD | NEW |