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/shell/shell_delegate_impl.h" | 5 #include "ash/shell/shell_delegate_impl.h" |
6 | 6 |
7 #include "ash/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/default_accessibility_delegate.h" | 8 #include "ash/default_accessibility_delegate.h" |
9 #include "ash/default_user_wallpaper_delegate.h" | 9 #include "ash/default_user_wallpaper_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/context_menu.h" | 14 #include "ash/shell/context_menu.h" |
15 #include "ash/shell/example_factory.h" | 15 #include "ash/shell/example_factory.h" |
16 #include "ash/shell/keyboard_controller_proxy_stub.h" | 16 #include "ash/shell/keyboard_controller_proxy_stub.h" |
17 #include "ash/shell/shelf_delegate_impl.h" | 17 #include "ash/shell/shelf_delegate_impl.h" |
18 #include "ash/shell/toplevel_window.h" | 18 #include "ash/shell/toplevel_window.h" |
19 #include "ash/shell_window_ids.h" | 19 #include "ash/shell_window_ids.h" |
20 #include "ash/system/tray/default_system_tray_delegate.h" | 20 #include "ash/system/tray/default_system_tray_delegate.h" |
21 #include "ash/wm/window_state.h" | 21 #include "ash/wm/window_state.h" |
22 #include "base/message_loop/message_loop.h" | 22 #include "base/message_loop/message_loop.h" |
23 #include "base/strings/utf_string_conversions.h" | 23 #include "base/strings/utf_string_conversions.h" |
24 #include "components/user_manager/user_info_impl.h" | 24 #include "components/user_manager/user_info_impl.h" |
25 #include "ui/app_list/app_list_view_delegate.h" | 25 #include "ui/app_list/app_list_view_delegate.h" |
26 #include "ui/aura/window.h" | 26 #include "ui/aura/window.h" |
| 27 #include "ui/gfx/image/image.h" |
27 | 28 |
28 namespace ash { | 29 namespace ash { |
29 namespace shell { | 30 namespace shell { |
30 namespace { | 31 namespace { |
31 | 32 |
32 class NewWindowDelegateImpl : public NewWindowDelegate { | 33 class NewWindowDelegateImpl : public NewWindowDelegate { |
33 public: | 34 public: |
34 NewWindowDelegateImpl() {} | 35 NewWindowDelegateImpl() {} |
35 ~NewWindowDelegateImpl() override {} | 36 ~NewWindowDelegateImpl() override {} |
36 | 37 |
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
262 | 263 |
263 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { | 264 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { |
264 // Real GPU support depends on src/content, so just use a stub. | 265 // Real GPU support depends on src/content, so just use a stub. |
265 return new GPUSupportStub; | 266 return new GPUSupportStub; |
266 } | 267 } |
267 | 268 |
268 base::string16 ShellDelegateImpl::GetProductName() const { | 269 base::string16 ShellDelegateImpl::GetProductName() const { |
269 return base::string16(); | 270 return base::string16(); |
270 } | 271 } |
271 | 272 |
| 273 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
| 274 return gfx::Image(); |
| 275 } |
| 276 |
272 } // namespace shell | 277 } // namespace shell |
273 } // namespace ash | 278 } // namespace ash |
OLD | NEW |