| Index: chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
|
| index 532110e5dbb52638bf606c12efef094292d482ce..4a40d2d2a603e7089a7f1140750d21efbbb409e6 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
|
| @@ -21,19 +21,12 @@ class ChromeShelfItemDelegate;
|
| class ChromeMashShelfController : public mash::shelf::mojom::ShelfObserver,
|
| public AppIconLoaderDelegate {
|
| public:
|
| + ChromeMashShelfController();
|
| ~ChromeMashShelfController() override;
|
|
|
| - // Creates an instance.
|
| - static ChromeMashShelfController* CreateInstance();
|
| -
|
| - // Returns the single ChromeMashShelfController instance.
|
| - static ChromeMashShelfController* instance() { return instance_; }
|
| -
|
| void LaunchItem(const std::string& app_id);
|
|
|
| private:
|
| - ChromeMashShelfController();
|
| -
|
| void Init();
|
|
|
| void PinAppsFromPrefs();
|
| @@ -49,8 +42,6 @@ class ChromeMashShelfController : public mash::shelf::mojom::ShelfObserver,
|
| void OnAppImageUpdated(const std::string& app_id,
|
| const gfx::ImageSkia& image) override;
|
|
|
| - static ChromeMashShelfController* instance_;
|
| -
|
| LauncherControllerHelper helper_;
|
| mash::shelf::mojom::ShelfControllerPtr shelf_controller_;
|
| mojo::AssociatedBinding<mash::shelf::mojom::ShelfObserver> observer_binding_;
|
|
|