Mustash implementation of ChromeLauncherController.

chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.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 "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
 
 #include "chrome/browser/extensions/extension_app_icon_loader.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_types.h"
 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "extensions/common/constants.h"
 #include "extensions/grit/extensions_browser_resources.h"
 #include "mojo/common/common_type_converters.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 class ChromeShelfItemDelegate : public mash::shelf::mojom::ShelfItemDelegate {
  public:
-  explicit ChromeShelfItemDelegate(const std::string& app_id)
-      : app_id_(app_id), item_delegate_binding_(this) {}
+  explicit ChromeShelfItemDelegate(const std::string& app_id,
+                                   ChromeMashShelfController* controller)
+      : app_id_(app_id),
+        item_delegate_binding_(this),
+        controller_(controller) {}
   ~ChromeShelfItemDelegate() override {}
 
   mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo
   CreateInterfacePtrInfoAndBind(mojo::AssociatedGroup* associated_group) {
     DCHECK(!item_delegate_binding_.is_bound());
     mash::shelf::mojom::ShelfItemDelegateAssociatedPtrInfo ptr_info;
     item_delegate_binding_.Bind(&ptr_info, associated_group);
     return ptr_info;
   }
 
  private:
   // mash::shelf::mojom::ShelfItemDelegate:
-  void LaunchItem() override {
-    ChromeMashShelfController::instance()->LaunchItem(app_id_);
-  }
+  void LaunchItem() override { controller_->LaunchItem(app_id_); }
   void ExecuteCommand(uint32_t command_id, int32_t event_flags) override {
     NOTIMPLEMENTED();
   }
   void ItemPinned() override { NOTIMPLEMENTED(); }
   void ItemUnpinned() override { NOTIMPLEMENTED(); }
   void ItemReordered(uint32_t order) override { NOTIMPLEMENTED(); }
 
   std::string app_id_;
   mojo::AssociatedBinding<mash::shelf::mojom::ShelfItemDelegate>
       item_delegate_binding_;
 
+  // Not owned.
+  ChromeMashShelfController* controller_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeShelfItemDelegate);
 };
 
-// static
-ChromeMashShelfController* ChromeMashShelfController::instance_ = nullptr;
+ChromeMashShelfController::ChromeMashShelfController()
+    : helper_(ProfileManager::GetActiveUserProfile()),
+      observer_binding_(this) {}
 
 ChromeMashShelfController::~ChromeMashShelfController() {}
 
-// static
-ChromeMashShelfController* ChromeMashShelfController::CreateInstance() {
-  DCHECK(!instance_);
-  instance_ = new ChromeMashShelfController();
-  instance_->Init();

[msw, 2016/06/13 21:01:22]

You'll need to call Init() at some point. Inline it in the ctor, call it from
the ctor, or call it from the ChromeLauncherControllerMus ctor (or that class'
Init if you call that anywhere)

[mfomitchev, 2016/06/13 21:33:31]

Oops! Thanks, done.

-  return instance_;
-}
-
 void ChromeMashShelfController::LaunchItem(const std::string& app_id) {
   helper_.LaunchApp(app_id, ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
 }
 
-ChromeMashShelfController::ChromeMashShelfController()
-    : helper_(ProfileManager::GetActiveUserProfile()),
-      observer_binding_(this) {}
-
 void ChromeMashShelfController::Init() {
   shell::Connector* connector =
       content::MojoShellConnection::Get()->GetConnector();
   connector->ConnectToInterface("mojo:ash_sysui", &shelf_controller_);
 
   // Set shelf alignment and auto-hide behavior from preferences.
   Profile* profile = ProfileManager::GetActiveUserProfile();
   int64_t display_id = display::Screen::GetScreen()->GetPrimaryDisplay().id();
   shelf_controller_->SetAlignment(static_cast<mash::shelf::mojom::Alignment>(
       ash::GetShelfAlignmentPref(profile->GetPrefs(), display_id)));
@@ skipping 34 matching lines @@
     if (app == ash::kPinnedAppsPlaceholder)
       continue;
 
     mash::shelf::mojom::ShelfItemPtr item(mash::shelf::mojom::ShelfItem::New());
     item->app_id = app;
     item->app_title = mojo::String::From(helper_.GetAppTitle(profile, app));
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const gfx::Image& image = rb.GetImageNamed(IDR_APP_DEFAULT_ICON);
     item->image = *image.ToSkBitmap();
     std::unique_ptr<ChromeShelfItemDelegate> delegate(
-        new ChromeShelfItemDelegate(app));
+        new ChromeShelfItemDelegate(app, this));
     shelf_controller_->PinItem(std::move(item),
                                delegate->CreateInterfacePtrInfoAndBind(
                                    shelf_controller_.associated_group()));
     app_id_to_item_delegate_.insert(std::make_pair(app, std::move(delegate)));
 
     AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app);
     if (app_icon_loader) {
       app_icon_loader->FetchImage(app);
       app_icon_loader->UpdateImage(app);
     }
@@ skipping 23 matching lines @@
   ash::SetShelfAutoHideBehaviorPref(
       ProfileManager::GetActiveUserProfile()->GetPrefs(),
       display::Screen::GetScreen()->GetPrimaryDisplay().id(),
       static_cast<ash::ShelfAutoHideBehavior>(auto_hide));
 }
 
 void ChromeMashShelfController::OnAppImageUpdated(const std::string& app_id,
                                                   const gfx::ImageSkia& image) {
   shelf_controller_->SetItemImage(app_id, *image.bitmap());
 }