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/accessibility_delegate.h" | 7 #include "ash/accessibility_delegate.h" |
8 #include "ash/default_accessibility_delegate.h" | 8 #include "ash/default_accessibility_delegate.h" |
9 #include "ash/default_user_wallpaper_delegate.h" | 9 #include "ash/default_user_wallpaper_delegate.h" |
10 #include "ash/gpu_support_stub.h" | 10 #include "ash/gpu_support_stub.h" |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 | 218 |
219 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { | 219 ash::NewWindowDelegate* ShellDelegateImpl::CreateNewWindowDelegate() { |
220 return new NewWindowDelegateImpl; | 220 return new NewWindowDelegateImpl; |
221 } | 221 } |
222 | 222 |
223 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { | 223 ash::MediaDelegate* ShellDelegateImpl::CreateMediaDelegate() { |
224 return new MediaDelegateImpl; | 224 return new MediaDelegateImpl; |
225 } | 225 } |
226 | 226 |
227 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( | 227 ui::MenuModel* ShellDelegateImpl::CreateContextMenu( |
228 aura::Window* root_window, | 228 ash::Shelf* shelf, |
229 const ash::ShelfItem* item) { | 229 const ash::ShelfItem* item) { |
230 return new ContextMenu(root_window); | 230 return new ContextMenu(shelf); |
231 } | 231 } |
232 | 232 |
233 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { | 233 GPUSupport* ShellDelegateImpl::CreateGPUSupport() { |
234 // Real GPU support depends on src/content, so just use a stub. | 234 // Real GPU support depends on src/content, so just use a stub. |
235 return new GPUSupportStub; | 235 return new GPUSupportStub; |
236 } | 236 } |
237 | 237 |
238 base::string16 ShellDelegateImpl::GetProductName() const { | 238 base::string16 ShellDelegateImpl::GetProductName() const { |
239 return base::string16(); | 239 return base::string16(); |
240 } | 240 } |
241 | 241 |
242 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { | 242 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { |
243 return gfx::Image(); | 243 return gfx::Image(); |
244 } | 244 } |
245 | 245 |
246 } // namespace shell | 246 } // namespace shell |
247 } // namespace ash | 247 } // namespace ash |
OLD | NEW |