| 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" |
| (...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 247 | 247 |
| 248 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { | 248 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { |
| 249 return new NewWindowDelegateImpl; | 249 return new NewWindowDelegateImpl; |
| 250 } | 250 } |
| 251 | 251 |
| 252 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { | 252 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { |
| 253 return new MediaDelegateImpl; | 253 return new MediaDelegateImpl; |
| 254 } | 254 } |
| 255 | 255 |
| 256 std::unique_ptr<PaletteDelegate> ShellDelegateImpl::CreatePaletteDelegate() { | 256 std::unique_ptr<PaletteDelegate> ShellDelegateImpl::CreatePaletteDelegate() { |
| 257 return base::WrapUnique(new PaletteDelegateImpl()); | 257 return base::MakeUnique<PaletteDelegateImpl>(); |
| 258 } | 258 } |
| 259 | 259 |
| 260 std::unique_ptr<ash::PointerWatcherDelegate> | 260 std::unique_ptr<ash::PointerWatcherDelegate> |
| 261 ShellDelegateImpl::CreatePointerWatcherDelegate() { | 261 ShellDelegateImpl::CreatePointerWatcherDelegate() { |
| 262 return base::WrapUnique(new PointerWatcherDelegateAura); | 262 return base::WrapUnique(new PointerWatcherDelegateAura); |
| 263 } | 263 } |
| 264 | 264 |
| 265 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf, | 265 ui::MenuModel* ShellDelegateImpl::CreateContextMenu(WmShelf* wm_shelf, |
| 266 const ShelfItem* item) { | 266 const ShelfItem* item) { |
| 267 return new ContextMenu(wm_shelf); | 267 return new ContextMenu(wm_shelf); |
| 268 } | 268 } |
| 269 | 269 |
| 270 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { | 270 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { |
| 271 // Real GPU support depends on src/content, so just use a stub. | 271 // Real GPU support depends on src/content, so just use a stub. |
| 272 return new GPUSupportStub; | 272 return new GPUSupportStub; |
| 273 } | 273 } |
| 274 | 274 |
| 275 base::string16 ShellDelegateImpl::GetProductName() const { | 275 base::string16 ShellDelegateImpl::GetProductName() const { |
| 276 return base::string16(); | 276 return base::string16(); |
| 277 } | 277 } |
| 278 | 278 |
| 279 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { | 279 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
| 280 return gfx::Image(); | 280 return gfx::Image(); |
| 281 } | 281 } |
| 282 | 282 |
| 283 } // namespace shell | 283 } // namespace shell |
| 284 } // namespace ash | 284 } // namespace ash |
| OLD | NEW |