Hook up Chrome's wallpaper picker for mash.

ash/mus/user_wallpaper_delegate_mus.h

Index: ash/mus/user_wallpaper_delegate_mus.h
diff --git a/ash/default_user_wallpaper_delegate.h b/ash/mus/user_wallpaper_delegate_mus.h
similarity index 57%
copy from ash/default_user_wallpaper_delegate.h
copy to ash/mus/user_wallpaper_delegate_mus.h
index 80e20b1bbf33a108da5d738e42596a20472426f4..48b4c94d45a75c3f7d124a38a0a19d0d651d059c 100644
--- a/ash/default_user_wallpaper_delegate.h
+++ b/ash/mus/user_wallpaper_delegate_mus.h
@@ -1,22 +1,26 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef ASH_DEFAULT_USER_WALLPAPER_DELEGATE_H_
-#define ASH_DEFAULT_USER_WALLPAPER_DELEGATE_H_
+#ifndef ASH_USER_WALLPAPER_DELEGATE_MUS_H_
+#define ASH_USER_WALLPAPER_DELEGATE_MUS_H_
 
 #include "ash/ash_export.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "base/compiler_specific.h"

[James Cook, 2016/05/19 22:29:59]

not needed

[msw, 2016/05/20 19:53:05]

Done.

 #include "base/macros.h"
+#include "mash/public/interfaces/wallpaper.mojom.h"
 
 namespace ash {
 
-class ASH_EXPORT DefaultUserWallpaperDelegate : public UserWallpaperDelegate {
+class ASH_EXPORT UserWallpaperDelegateMus
+    : public UserWallpaperDelegate,
+      public mash::mojom::WallpaperController {
  public:
-  DefaultUserWallpaperDelegate() {}
-  ~DefaultUserWallpaperDelegate() override {}
+  UserWallpaperDelegateMus() {}

[James Cook, 2016/05/19 22:30:00]

nit: stick the {} implementations in the .cc file

[msw, 2016/05/20 19:53:05]

Done.

+  ~UserWallpaperDelegateMus() override {}
 
+ private:
   // UserWallpaperDelegate overrides:
   int GetAnimationType() override;
   int GetAnimationDurationOverride() override;
@@ -29,10 +33,12 @@ class ASH_EXPORT DefaultUserWallpaperDelegate : public UserWallpaperDelegate {
   void OnWallpaperAnimationFinished() override;
   void OnWallpaperBootAnimationFinished() override;
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(DefaultUserWallpaperDelegate);
+  // mash::mojom::WallpaperController overrides:
+  void SetWallpaper(skia::mojom::BitmapPtr wallpaper, int32_t layout) override;
+
+  DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegateMus);
 };
 
 }  // namespace ash
 
-#endif  // ASH_DEFAULT_USER_WALLPAPER_DELEGATE_H_
+#endif  // ASH_USER_WALLPAPER_DELEGATE_MUS_H_