| Index: chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
|
| index d3931a0b9bf4e3c0618f100f0d33b535cc69c51d..cb26f96d37f4678c342db5856f57c8d991b3a9e8 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #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"
|
| @@ -19,10 +20,6 @@
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/display/screen.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "chrome/browser/ui/app_list/arc/arc_app_icon_loader.h"
|
| -#endif
|
| -
|
| class ChromeShelfItemDelegate : public mash::shelf::mojom::ShelfItemDelegate {
|
| public:
|
| explicit ChromeShelfItemDelegate(const std::string& app_id)
|
| @@ -101,11 +98,9 @@ void ChromeMashShelfController::Init() {
|
| profile, extension_misc::EXTENSION_ICON_SMALL, this));
|
| app_icon_loaders_.push_back(std::move(extension_app_icon_loader));
|
|
|
| -#if defined(OS_CHROMEOS)
|
| std::unique_ptr<AppIconLoader> arc_app_icon_loader(new ArcAppIconLoader(
|
| profile, extension_misc::EXTENSION_ICON_SMALL, this));
|
| app_icon_loaders_.push_back(std::move(arc_app_icon_loader));
|
| -#endif
|
|
|
| PinAppsFromPrefs();
|
|
|
|
|