Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Side by Side Diff: ash/shell/shell_delegate_impl.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move factory ownership to WindowManagerApplication; to match AuraInit/ViewsDelegate. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "ash/common/media_delegate.h" 11 #include "ash/common/media_delegate.h"
12 #include "ash/common/new_window_delegate.h" 12 #include "ash/common/new_window_delegate.h"
13 #include "ash/common/palette_delegate.h" 13 #include "ash/common/palette_delegate.h"
14 #include "ash/common/session/session_state_delegate.h" 14 #include "ash/common/session/session_state_delegate.h"
15 #include "ash/common/shell_window_ids.h" 15 #include "ash/common/shell_window_ids.h"
16 #include "ash/common/system/tray/default_system_tray_delegate.h" 16 #include "ash/common/system/tray/default_system_tray_delegate.h"
17 #include "ash/common/wm/window_state.h" 17 #include "ash/common/wm/window_state.h"
18 #include "ash/default_user_wallpaper_delegate.h" 18 #include "ash/default_wallpaper_delegate.h"
19 #include "ash/shell.h" 19 #include "ash/shell.h"
20 #include "ash/shell/context_menu.h" 20 #include "ash/shell/context_menu.h"
21 #include "ash/shell/example_factory.h" 21 #include "ash/shell/example_factory.h"
22 #include "ash/shell/toplevel_window.h" 22 #include "ash/shell/toplevel_window.h"
23 #include "ash/test/test_keyboard_ui.h" 23 #include "ash/test/test_keyboard_ui.h"
24 #include "ash/test/test_shelf_delegate.h" 24 #include "ash/test/test_shelf_delegate.h"
25 #include "base/memory/ptr_util.h" 25 #include "base/memory/ptr_util.h"
26 #include "base/message_loop/message_loop.h" 26 #include "base/message_loop/message_loop.h"
27 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
28 #include "components/user_manager/user_info_impl.h" 28 #include "components/user_manager/user_info_impl.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) { 233 ShelfDelegate* ShellDelegateImpl::CreateShelfDelegate(ShelfModel* model) {
234 shelf_delegate_ = new test::TestShelfDelegate(model); 234 shelf_delegate_ = new test::TestShelfDelegate(model);
235 return shelf_delegate_; 235 return shelf_delegate_;
236 } 236 }
237 237
238 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() { 238 ash::SystemTrayDelegate* ShellDelegateImpl::CreateSystemTrayDelegate() {
239 return new DefaultSystemTrayDelegate; 239 return new DefaultSystemTrayDelegate;
240 } 240 }
241 241
242 ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { 242 ash::WallpaperDelegate* ShellDelegateImpl::CreateWallpaperDelegate() {
243 return new DefaultUserWallpaperDelegate(); 243 return new DefaultWallpaperDelegate();
244 } 244 }
245 245
246 ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() { 246 ash::SessionStateDelegate* ShellDelegateImpl::CreateSessionStateDelegate() {
247 return new SessionStateDelegateImpl; 247 return new SessionStateDelegateImpl;
248 } 248 }
249 249
250 ash::AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() { 250 ash::AccessibilityDelegate* ShellDelegateImpl::CreateAccessibilityDelegate() {
251 return new DefaultAccessibilityDelegate; 251 return new DefaultAccessibilityDelegate;
252 } 252 }
253 253
(...skipping 22 matching lines...) Expand all
276 base::string16 ShellDelegateImpl::GetProductName() const { 276 base::string16 ShellDelegateImpl::GetProductName() const {
277 return base::string16(); 277 return base::string16();
278 } 278 }
279 279
280 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const { 280 gfx::Image ShellDelegateImpl::GetDeprecatedAcceleratorImage() const {
281 return gfx::Image(); 281 return gfx::Image();
282 } 282 }
283 283
284 } // namespace shell 284 } // namespace shell
285 } // namespace ash 285 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698