Hook up Chrome's wallpaper picker for mash.

ash/sysui/shell_delegate_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/sysui/shell_delegate_mus.h"
 
 #include "ash/default_accessibility_delegate.h"
-#include "ash/default_user_wallpaper_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/media_delegate.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/system/tray/default_system_tray_delegate.h"
 #include "ash/sysui/app_list_presenter_mus.h"
 #include "ash/sysui/container_delegate_mus.h"
 #include "ash/sysui/context_menu_mus.h"
 #include "ash/sysui/pointer_watcher_delegate_mus.h"
 #include "ash/sysui/shelf_delegate_mus.h"
+#include "ash/sysui/user_wallpaper_delegate_mus.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "components/user_manager/user_info_impl.h"
 #include "ui/app_list/presenter/app_list_presenter.h"
 #include "ui/gfx/image/image.h"
 
 namespace ash {
 namespace sysui {
 
 namespace {
@@ skipping 150 matching lines @@
 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) {
   return new ShelfDelegateMus(model);
 }
 
 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() {
   NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation";
   return new DefaultSystemTrayDelegate;
 }
 
 UserWallpaperDelegate* ShellDelegateMus::CreateUserWallpaperDelegate() {
-  NOTIMPLEMENTED() << " Using the default UserWallpaperDelegate implementation";
-  return new DefaultUserWallpaperDelegate();
+  return new UserWallpaperDelegateMus();
 }
 
 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
   NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
   return new SessionStateDelegateStub;
 }
 
 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
   NOTIMPLEMENTED() << " Using the default AccessibilityDelegate implementation";
   return new DefaultAccessibilityDelegate;
@@ skipping 33 matching lines @@
   return base::string16();
 }
 
 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
   NOTIMPLEMENTED();
   return gfx::Image();
 }
 
 }  // namespace sysui
 }  // namespace ash