| 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/common/accessibility_delegate.h" | 7 #include "ash/common/accessibility_delegate.h" |
| 8 #include "ash/common/default_accessibility_delegate.h" | 8 #include "ash/common/default_accessibility_delegate.h" |
| 9 #include "ash/common/gpu_support_stub.h" | 9 #include "ash/common/gpu_support_stub.h" |
| 10 #include "ash/common/palette_delegate.h" | 10 #include "ash/common/palette_delegate.h" |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 base::MessageLoop::current()->QuitWhenIdle(); | 156 base::MessageLoop::current()->QuitWhenIdle(); |
| 157 } | 157 } |
| 158 | 158 |
| 159 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() { | 159 keyboard::KeyboardUI* ShellDelegateImpl::CreateKeyboardUI() { |
| 160 return new TestKeyboardUI; | 160 return new TestKeyboardUI; |
| 161 } | 161 } |
| 162 | 162 |
| 163 void ShellDelegateImpl::OpenUrlFromArc(const GURL& url) {} | 163 void ShellDelegateImpl::OpenUrlFromArc(const GURL& url) {} |
| 164 | 164 |
| 165 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { | 165 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { |
| 166 shelf_delegate_ = new test::TestShelfDelegate(model); | 166 return new test::TestShelfDelegate(); |
| 167 return shelf_delegate_; | |
| 168 } | 167 } |
| 169 | 168 |
| 170 SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { | 169 SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { |
| 171 return new DefaultSystemTrayDelegate; | 170 return new DefaultSystemTrayDelegate; |
| 172 } | 171 } |
| 173 | 172 |
| 174 std::unique_ptr<WallpaperDelegate> | 173 std::unique_ptr<WallpaperDelegate> |
| 175 ShellDelegateImpl::CreateWallpaperDelegate() { | 174 ShellDelegateImpl::CreateWallpaperDelegate() { |
| 176 return base::MakeUnique<DefaultWallpaperDelegate>(); | 175 return base::MakeUnique<DefaultWallpaperDelegate>(); |
| 177 } | 176 } |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 return true; | 210 return true; |
| 212 } | 211 } |
| 213 | 212 |
| 214 void ShellDelegateImpl::SetTouchscreenEnabledInPrefs(bool enabled, | 213 void ShellDelegateImpl::SetTouchscreenEnabledInPrefs(bool enabled, |
| 215 bool use_local_state) {} | 214 bool use_local_state) {} |
| 216 | 215 |
| 217 void ShellDelegateImpl::UpdateTouchscreenStatusFromPrefs() {} | 216 void ShellDelegateImpl::UpdateTouchscreenStatusFromPrefs() {} |
| 218 | 217 |
| 219 } // namespace shell | 218 } // namespace shell |
| 220 } // namespace ash | 219 } // namespace ash |
| OLD | NEW |