| 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/default_accessibility_delegate.h" | 10 #include "ash/default_accessibility_delegate.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 | 91 |
| 92 content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { | 92 content::BrowserContext* TestShellDelegate::GetCurrentBrowserContext() { |
| 93 current_browser_context_.reset(new content::TestBrowserContext()); | 93 current_browser_context_.reset(new content::TestBrowserContext()); |
| 94 return current_browser_context_.get(); | 94 return current_browser_context_.get(); |
| 95 } | 95 } |
| 96 | 96 |
| 97 app_list::AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { | 97 app_list::AppListViewDelegate* TestShellDelegate::CreateAppListViewDelegate() { |
| 98 return NULL; | 98 return NULL; |
| 99 } | 99 } |
| 100 | 100 |
| 101 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate( | 101 LauncherDelegate* TestShellDelegate::CreateLauncherDelegate(ShelfModel* model) { |
| 102 ash::LauncherModel* model) { | |
| 103 return new TestLauncherDelegate(model); | 102 return new TestLauncherDelegate(model); |
| 104 } | 103 } |
| 105 | 104 |
| 106 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { | 105 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() { |
| 107 return new TestSystemTrayDelegate; | 106 return new TestSystemTrayDelegate; |
| 108 } | 107 } |
| 109 | 108 |
| 110 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { | 109 UserWallpaperDelegate* TestShellDelegate::CreateUserWallpaperDelegate() { |
| 111 return new TestUserWallpaperDelegate(); | 110 return new TestUserWallpaperDelegate(); |
| 112 } | 111 } |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 base::string16 TestShellDelegate::GetProductName() const { | 150 base::string16 TestShellDelegate::GetProductName() const { |
| 152 return base::string16(); | 151 return base::string16(); |
| 153 } | 152 } |
| 154 | 153 |
| 155 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { | 154 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() { |
| 156 return test_session_state_delegate_; | 155 return test_session_state_delegate_; |
| 157 } | 156 } |
| 158 | 157 |
| 159 } // namespace test | 158 } // namespace test |
| 160 } // namespace ash | 159 } // namespace ash |
| OLD | NEW |