| 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 <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "ash/caps_lock_delegate_stub.h" | 9 #include "ash/caps_lock_delegate_stub.h" |
| 10 #include "ash/default_user_wallpaper_delegate.h" |
| 10 #include "ash/host/root_window_host_factory.h" | 11 #include "ash/host/root_window_host_factory.h" |
| 11 #include "ash/keyboard_controller_proxy_stub.h" | 12 #include "ash/keyboard_controller_proxy_stub.h" |
| 12 #include "ash/session_state_delegate.h" | 13 #include "ash/session_state_delegate.h" |
| 13 #include "ash/session_state_delegate_stub.h" | 14 #include "ash/session_state_delegate_stub.h" |
| 14 #include "ash/shell/context_menu.h" | 15 #include "ash/shell/context_menu.h" |
| 15 #include "ash/shell/example_factory.h" | 16 #include "ash/shell/example_factory.h" |
| 16 #include "ash/shell/launcher_delegate_impl.h" | 17 #include "ash/shell/launcher_delegate_impl.h" |
| 17 #include "ash/shell/toplevel_window.h" | 18 #include "ash/shell/toplevel_window.h" |
| 18 #include "ash/shell_window_ids.h" | 19 #include "ash/shell_window_ids.h" |
| 19 #include "ash/system/tray/default_system_tray_delegate.h" | 20 #include "ash/system/tray/default_system_tray_delegate.h" |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 ash::LauncherModel* model) { | 167 ash::LauncherModel* model) { |
| 167 launcher_delegate_ = new LauncherDelegateImpl(watcher_); | 168 launcher_delegate_ = new LauncherDelegateImpl(watcher_); |
| 168 return launcher_delegate_; | 169 return launcher_delegate_; |
| 169 } | 170 } |
| 170 | 171 |
| 171 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { | 172 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { |
| 172 return new DefaultSystemTrayDelegate; | 173 return new DefaultSystemTrayDelegate; |
| 173 } | 174 } |
| 174 | 175 |
| 175 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { | 176 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { |
| 176 return NULL; | 177 return new DefaultUserWallpaperDelegate(); |
| 177 } | 178 } |
| 178 | 179 |
| 179 ash::CapsLockDelegate* ShellDelegateImpl::CreateCapsLockDelegate() { | 180 ash::CapsLockDelegate* ShellDelegateImpl::CreateCapsLockDelegate() { |
| 180 return new CapsLockDelegateStub; | 181 return new CapsLockDelegateStub; |
| 181 } | 182 } |
| 182 | 183 |
| 183 ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { | 184 ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { |
| 184 return new SessionStateDelegateStub; | 185 return new SessionStateDelegateStub; |
| 185 } | 186 } |
| 186 | 187 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 217 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { | 218 RootWindowHostFactory* ShellDelegateImpl::CreateRootWindowHostFactory() { |
| 218 return RootWindowHostFactory::Create(); | 219 return RootWindowHostFactory::Create(); |
| 219 } | 220 } |
| 220 | 221 |
| 221 base::string16 ShellDelegateImpl::GetProductName() const { | 222 base::string16 ShellDelegateImpl::GetProductName() const { |
| 222 return base::string16(); | 223 return base::string16(); |
| 223 } | 224 } |
| 224 | 225 |
| 225 } // namespace shell | 226 } // namespace shell |
| 226 } // namespace ash | 227 } // namespace ash |
| OLD | NEW |