| 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/app_list/app_list_presenter_delegate_factory.h" | 7 #include "ash/app_list/app_list_presenter_delegate_factory.h" |
| 8 #include "ash/common/accessibility_delegate.h" | 8 #include "ash/common/accessibility_delegate.h" |
| 9 #include "ash/common/default_accessibility_delegate.h" | 9 #include "ash/common/default_accessibility_delegate.h" |
| 10 #include "ash/common/gpu_support_stub.h" | 10 #include "ash/common/gpu_support_stub.h" |
| 11 #include "ash/common/media_delegate.h" | 11 #include "ash/common/media_delegate.h" |
| 12 #include "ash/common/new_window_delegate.h" | 12 #include "ash/common/new_window_delegate.h" |
| 13 #include "ash/common/palette_delegate.h" | 13 #include "ash/common/palette_delegate.h" |
| 14 #include "ash/common/session/session_state_delegate.h" | 14 #include "ash/common/session/session_state_delegate.h" |
| 15 #include "ash/common/shell_window_ids.h" | 15 #include "ash/common/shell_window_ids.h" |
| 16 #include "ash/common/system/tray/default_system_tray_delegate.h" | 16 #include "ash/common/system/tray/default_system_tray_delegate.h" |
| 17 #include "ash/common/wm/window_state.h" | 17 #include "ash/common/wm/window_state.h" |
| 18 #include "ash/default_user_wallpaper_delegate.h" | 18 #include "ash/default_wallpaper_delegate.h" |
| 19 #include "ash/shell.h" | 19 #include "ash/shell.h" |
| 20 #include "ash/shell/context_menu.h" | 20 #include "ash/shell/context_menu.h" |
| 21 #include "ash/shell/example_factory.h" | 21 #include "ash/shell/example_factory.h" |
| 22 #include "ash/shell/shelf_delegate_impl.h" | 22 #include "ash/shell/shelf_delegate_impl.h" |
| 23 #include "ash/shell/toplevel_window.h" | 23 #include "ash/shell/toplevel_window.h" |
| 24 #include "ash/test/test_keyboard_ui.h" | 24 #include "ash/test/test_keyboard_ui.h" |
| 25 #include "base/memory/ptr_util.h" | 25 #include "base/memory/ptr_util.h" |
| 26 #include "base/message_loop/message_loop.h" | 26 #include "base/message_loop/message_loop.h" |
| 27 #include "base/strings/utf_string_conversions.h" | 27 #include "base/strings/utf_string_conversions.h" |
| 28 #include "components/user_manager/user_info_impl.h" | 28 #include "components/user_manager/user_info_impl.h" |
| (...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 | 229 |
| 230 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { | 230 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { |
| 231 shelf_delegate_ = new ShelfDelegateImpl(); | 231 shelf_delegate_ = new ShelfDelegateImpl(); |
| 232 return shelf_delegate_; | 232 return shelf_delegate_; |
| 233 } | 233 } |
| 234 | 234 |
| 235 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { | 235 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { |
| 236 return new DefaultSystemTrayDelegate; | 236 return new DefaultSystemTrayDelegate; |
| 237 } | 237 } |
| 238 | 238 |
| 239 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { | 239 ash::WallpaperDelegate* ShellDelegateImpl::CreateWallpaperDelegate() { |
| 240 return new DefaultUserWallpaperDelegate(); | 240 return new DefaultWallpaperDelegate(); |
| 241 } | 241 } |
| 242 | 242 |
| 243 ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { | 243 ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { |
| 244 return new SessionStateDelegateImpl; | 244 return new SessionStateDelegateImpl; |
| 245 } | 245 } |
| 246 | 246 |
| 247 ash::AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() { | 247 ash::AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() { |
| 248 return new DefaultAccessibilityDelegate; | 248 return new DefaultAccessibilityDelegate; |
| 249 } | 249 } |
| 250 | 250 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 273 base::string16 ShellDelegateImpl::GetProductName() const { | 273 base::string16 ShellDelegateImpl::GetProductName() const { |
| 274 return base::string16(); | 274 return base::string16(); |
| 275 } | 275 } |
| 276 | 276 |
| 277 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { | 277 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
| 278 return gfx::Image(); | 278 return gfx::Image(); |
| 279 } | 279 } |
| 280 | 280 |
| 281 } // namespace shell | 281 } // namespace shell |
| 282 } // namespace ash | 282 } // namespace ash |
| OLD | NEW |