Hook up Chrome's wallpaper picker for mash.

ash/mus/sysui_application.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/mus/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
-#include "ash/desktop_background/desktop_background_controller.h"
+#include "ash/display/display_manager.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.h"
 #include "ash/material_design/material_design_controller.h"
 #include "ash/mus/app_list_presenter_mus.h"
 #include "ash/mus/keyboard_ui_mus.h"
 #include "ash/mus/shelf_delegate_mus.h"
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/stub_context_factory.h"
+#include "ash/mus/user_wallpaper_delegate_mus.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/shell_window_ids.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/wm/public/interfaces/ash_window_type.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "services/catalog/public/cpp/resource_loader.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/display/display.h"
+#include "ui/display/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/platform_window/stub/stub_window.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/views_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ skipping 183 matching lines @@
     init_params.blocking_pool = worker_pool_.get();
     init_params.in_mus = true;
     init_params.keyboard_factory =
         base::Bind(&KeyboardUIMus::Create, connector);
     ash::Shell::CreateInstance(init_params);
     ash::Shell::GetInstance()->CreateShelf();
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         ash::user::LOGGED_IN_USER);
 
     ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
-    SetupWallpaper(SkColorSetARGB(255, 0, 255, 0));
   }
 
   void InitializeResourceBundle(::shell::Connector* connector) {
     if (ui::ResourceBundle::HasSharedInstance())
       return;
 
     std::set<std::string> resource_paths;
     resource_paths.insert(kResourceFileStrings);
     resource_paths.insert(kResourceFile100);
     resource_paths.insert(kResourceFile200);
 
     catalog::ResourceLoader loader;
     filesystem::mojom::DirectoryPtr directory;
     connector->ConnectToInterface("mojo:catalog", &directory);
     CHECK(loader.OpenFiles(std::move(directory), resource_paths));
 
     // Load ash resources and en-US strings; not 'common' (Chrome) resources.
     // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc.
     ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
         loader.TakeFile(kResourceFileStrings),
         base::MemoryMappedFile::Region::kWholeFile);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     rb.AddDataPackFromFile(loader.TakeFile(kResourceFile100),
                            ui::SCALE_FACTOR_100P);
     rb.AddDataPackFromFile(loader.TakeFile(kResourceFile200),
                            ui::SCALE_FACTOR_200P);
   }
 
-  void SetupWallpaper(SkColor color) {

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

So nice to see this going away!

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

Acknowledged.

-    SkBitmap bitmap;
-    bitmap.allocN32Pixels(16, 16);
-    bitmap.eraseColor(color);
-#if !defined(NDEBUG)
-    // In debug builds we generate a simple pattern that allows visually
-    // notice if transparency is broken.
-    {
-      SkAutoLockPixels alp(bitmap);
-      *bitmap.getAddr32(0, 0) = SkColorSetRGB(0, 0, 0);
-    }
-#endif
-    gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
-    ash::Shell::GetInstance()
-        ->desktop_background_controller()
-        ->SetWallpaperImage(wallpaper, wallpaper::WALLPAPER_LAYOUT_TILE);
-  }
-
   void InitializeComponents() {
     message_center::MessageCenter::Initialize();
 
 #if defined(OS_CHROMEOS)
     ui::DeviceDataManager::CreateInstance();
     chromeos::DBusThreadManager::Initialize();
     bluez::BluezDBusManager::Initialize(
         chromeos::DBusThreadManager::Get()->GetSystemBus(),
         chromeos::DBusThreadManager::Get()->IsUsingStub(
             chromeos::DBusClientBundle::BLUETOOTH));
@@ skipping 16 matching lines @@
 
 void SysUIApplication::Initialize(::shell::Connector* connector,
                                   const ::shell::Identity& identity,
                                   uint32_t id) {
   ash_init_.reset(new AshInit());
   ash_init_->Initialize(connector, identity);
 }
 
 bool SysUIApplication::AcceptConnection(::shell::Connection* connection) {
   connection->AddInterface<mash::shelf::mojom::ShelfController>(this);
+  connection->AddInterface<mash::mojom::WallpaperController>(this);
   return true;
 }
 
 void SysUIApplication::Create(
     ::shell::Connection* connection,
-    mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
+    mash::shelf::mojom::ShelfControllerRequest request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
+void SysUIApplication::Create(::shell::Connection* connection,
+                              mash::mojom::WallpaperControllerRequest request) {
+  mash::mojom::WallpaperController* wallpaper_controller =
+      static_cast<UserWallpaperDelegateMus*>(
+          Shell::GetInstance()->user_wallpaper_delegate());
+  wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
+                                            std::move(request));
+}
+
 }  // namespace sysui
 }  // namespace ash