| 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/caps_lock_delegate_stub.h" | 9 #include "ash/caps_lock_delegate_stub.h" |
| 10 #include "ash/host/root_window_host_factory.h" | 10 #include "ash/host/root_window_host_factory.h" |
| 11 #include "ash/keyboard_controller_proxy_stub.h" | 11 #include "ash/keyboard_controller_proxy_stub.h" |
| 12 #include "ash/session_state_delegate.h" | 12 #include "ash/session_state_delegate.h" |
| 13 #include "ash/shell.h" | 13 #include "ash/shell.h" |
| 14 #include "ash/shell_window_ids.h" | 14 #include "ash/shell_window_ids.h" |
| 15 #include "ash/test/test_launcher_delegate.h" | 15 #include "ash/test/test_launcher_delegate.h" |
| 16 #include "ash/test/test_session_state_delegate.h" | 16 #include "ash/test/test_session_state_delegate.h" |
| 17 #include "ash/test/test_system_tray_delegate.h" | 17 #include "ash/test/test_system_tray_delegate.h" |
| 18 #include "ash/test/test_user_wallpaper_delegate.h" |
| 18 #include "ash/wm/window_state.h" | 19 #include "ash/wm/window_state.h" |
| 19 #include "ash/wm/window_util.h" | 20 #include "ash/wm/window_util.h" |
| 20 #include "base/logging.h" | 21 #include "base/logging.h" |
| 21 #include "content/public/test/test_browser_context.h" | 22 #include "content/public/test/test_browser_context.h" |
| 22 #include "ui/aura/window.h" | 23 #include "ui/aura/window.h" |
| 23 #include "ui/compositor/compositor.h" | 24 #include "ui/compositor/compositor.h" |
| 24 | 25 |
| 25 namespace ash { | 26 namespace ash { |
| 26 namespace test { | 27 namespace test { |
| 27 | 28 |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( | 157 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( |
| 157 ash::LauncherModel* model) { | 158 ash::LauncherModel* model) { |
| 158 return new TestLauncherDelegate(model); | 159 return new TestLauncherDelegate(model); |
| 159 } | 160 } |
| 160 | 161 |
| 161 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { | 162 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { |
| 162 return new TestSystemTrayDelegate; | 163 return new TestSystemTrayDelegate; |
| 163 } | 164 } |
| 164 | 165 |
| 165 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { | 166 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { |
| 166 return NULL; | 167 return new TestUserWallpaperDelegate(); |
| 167 } | 168 } |
| 168 | 169 |
| 169 CapsLockDelegate* TestShellDelegate::CreateCapsLockDelegate() { | 170 CapsLockDelegate* TestShellDelegate::CreateCapsLockDelegate() { |
| 170 return new CapsLockDelegateStub; | 171 return new CapsLockDelegateStub; |
| 171 } | 172 } |
| 172 | 173 |
| 173 SessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() { | 174 SessionStateDelegate* TestShellDelegate::CreateSessionStateDelegate() { |
| 174 DCHECK(!test_session_state_delegate_); | 175 DCHECK(!test_session_state_delegate_); |
| 175 test_session_state_delegate_ = new TestSessionStateDelegate(); | 176 test_session_state_delegate_ = new TestSessionStateDelegate(); |
| 176 return test_session_state_delegate_; | 177 return test_session_state_delegate_; |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 base::string16 TestShellDelegate::GetProductName() const { | 218 base::string16 TestShellDelegate::GetProductName() const { |
| 218 return base::string16(); | 219 return base::string16(); |
| 219 } | 220 } |
| 220 | 221 |
| 221 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { | 222 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { |
| 222 return test_session_state_delegate_; | 223 return test_session_state_delegate_; |
| 223 } | 224 } |
| 224 | 225 |
| 225 } // namespace test | 226 } // namespace test |
| 226 } // namespace ash | 227 } // namespace ash |
| OLD | NEW |