Hook up Chrome's wallpaper picker for mash.

chrome/browser/chromeos/chrome_interface_factory.h

 // 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 CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
 #define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
 
 #include "content/public/common/mojo_shell_connection.h"
 #include "mash/public/interfaces/launchable.mojom.h"
+#include "mash/public/interfaces/wallpaper.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/interface_factory.h"
 #include "ui/app_list/presenter/app_list_presenter.mojom.h"
 #include "ui/keyboard/keyboard.mojom.h"
 
 class AppListPresenterService;
 class ChromeLaunchable;
+class ChromeWallpaperHelper;
 class KeyboardUIService;
 
 namespace chromeos {
 
 // InterfaceFactory for creating all services provided by chrome.
 class ChromeInterfaceFactory
     : public content::MojoShellConnection::Listener,
       public shell::InterfaceFactory<mash::mojom::Launchable>,
+      public shell::InterfaceFactory<mash::mojom::WallpaperHelper>,
       public shell::InterfaceFactory<app_list::mojom::AppListPresenter>,
       public shell::InterfaceFactory<keyboard::mojom::Keyboard> {

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

optional: While you're here, maybe move Keyboard up to after Listener, so it
matches the order of the functions and member variables in this file?

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

Done.

  public:
   ChromeInterfaceFactory();
   ~ChromeInterfaceFactory() override;
 
  private:
   // content::MojoShellConnection::Listener:
   bool AcceptConnection(shell::Connection* connection) override;
 
   // shell::InterfaceFactory<keyboard::Keyboard>:
   void Create(
       shell::Connection* connection,
       mojo::InterfaceRequest<keyboard::mojom::Keyboard> request) override;
 
   // mojo::InterfaceFactory<mash::mojom::Launchable>
   void Create(shell::Connection* connection,
               mash::mojom::LaunchableRequest request) override;
 
+  // mojo::InterfaceFactory<mash::mojom::WallpaperHelper>
+  void Create(shell::Connection* connection,
+              mash::mojom::WallpaperHelperRequest request) override;
+
   // mojo::InterfaceFactory<app_list::AppListPresenter>:
   void Create(shell::Connection* connection,
               mojo::InterfaceRequest<app_list::mojom::AppListPresenter> request)
       override;
 
   std::unique_ptr<KeyboardUIService> keyboard_ui_service_;
   mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
   std::unique_ptr<ChromeLaunchable> launchable_;
+  std::unique_ptr<ChromeWallpaperHelper> wallpaper_helper_;
   std::unique_ptr<AppListPresenterService> app_list_presenter_service_;
   mojo::BindingSet<app_list::mojom::AppListPresenter>
       app_list_presenter_bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeInterfaceFactory);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_