Load ash_sysui resources with ResourceLoader.

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/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.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/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 "components/resource_provider/public/cpp/resource_loader.h"
 #include "mash/wm/public/interfaces/ash_window_type.mojom.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.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"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #include "ui/events/devices/device_data_manager.h"
 #endif
 
 using views::ViewsDelegate;
 
 namespace ash {
 namespace sysui {
 
 namespace {
 
+const char kResourceFileStrings[] = "ash_resources_strings.pak";
+const char kResourceFile100[] = "ash_resources_100_percent.pak";
+const char kResourceFile200[] = "ash_resources_200_percent.pak";
+
 // Tries to determine the corresponding mash container from widget init params.
 mash::wm::mojom::Container GetContainerId(
     const views::Widget::InitParams& params) {
   const int id = params.parent->id();
   if (id == kShellWindowId_DesktopBackgroundContainer)
     return mash::wm::mojom::Container::USER_BACKGROUND;
   // mash::wm::ShelfLayout manages both the shelf and the status area.
   if (id == kShellWindowId_ShelfContainer ||
       id == kShellWindowId_StatusContainer) {
     return mash::wm::mojom::Container::USER_SHELF;
@@ skipping 111 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetFactory);
 };
 
 }  // namespace
 
 class AshInit {
  public:
   AshInit() : worker_pool_(new base::SequencedWorkerPool(2, "AshWorkerPool")) {
     ui::RegisterPathProvider();
-    InitializeResourceBundle();
   }
 
   ~AshInit() { worker_pool_->Shutdown(); }
 
   aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
 
   void Initialize(mojo::Connector* connector) {
+    InitializeResourceBundle(connector);
     aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
     views::WindowManagerConnection::Create(connector);
 
     gfx::Screen* screen = gfx::Screen::GetScreen();
     DCHECK(screen);
     gfx::Size size = screen->GetPrimaryDisplay().bounds().size();
 
     // Uninstall the ScreenMus installed by WindowManagerConnection, so that ash
     // installs and uses the ScreenAsh. This can be removed once ash learns to
     // talk to mus for managing displays.
@@ skipping 17 matching lines @@
         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() {
+  void InitializeResourceBundle(mojo::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);
+
+    resource_provider::ResourceLoader loader(connector, resource_paths);
+    if (!loader.BlockUntilLoaded())
+      return;
+
     // Load ash resources and en-US strings; not 'common' (Chrome) resources.
-    // TODO(msw): Do not load 'test' resources (include sys lang; rename paks?).
-    // TODO(msw): Use the ResourceProvider interface to load these pak files.
     // TODO(msw): Check ResourceBundle::IsScaleFactorSupported; load 300% etc.
-    base::FilePath path;
-    PathService::Get(base::DIR_MODULE, &path);
-    base::FilePath ash_test_strings =
-        path.Append(FILE_PATH_LITERAL("ash_test_strings.pak"));
-    base::FilePath ash_test_resources_100 =
-        path.Append(FILE_PATH_LITERAL("ash_test_resources_100_percent.pak"));
-    base::FilePath ash_test_resources_200 =
-        path.Append(FILE_PATH_LITERAL("ash_test_resources_200_percent.pak"));
-
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ash_test_strings);
+    ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
+        loader.ReleaseFile(kResourceFileStrings),
+        base::MemoryMappedFile::Region::kWholeFile);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    rb.AddDataPackFromPath(ash_test_resources_100, ui::SCALE_FACTOR_100P);
-    rb.AddDataPackFromPath(ash_test_resources_200, ui::SCALE_FACTOR_200P);
+    rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile100),
+                           ui::SCALE_FACTOR_100P);
+    rb.AddDataPackFromFile(loader.ReleaseFile(kResourceFile200),
+                           ui::SCALE_FACTOR_200P);
   }
 
   void SetupWallpaper(SkColor color) {
     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.
     {
@@ skipping 49 matching lines @@
 void SysUIApplication::Create(
     mojo::Connection* connection,
     mojo::InterfaceRequest<mash::shelf::mojom::ShelfController> request) {
   mash::shelf::mojom::ShelfController* shelf_controller =
       static_cast<ShelfDelegateMus*>(Shell::GetInstance()->GetShelfDelegate());
   shelf_controller_bindings_.AddBinding(shelf_controller, std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash