Index: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc |
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc |
index 8798149fe7276fa0a9275c12852ee8a2d72e7255..b2bf0b83064647d8fd7900f0801ba39d18a2e402 100644 |
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc |
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc |
@@ -3,7 +3,6 @@ |
// found in the LICENSE file. |
#include "ash/common/shelf/shelf_delegate.h" |
-#include "ash/common/shelf/shelf_model.h" |
#include "ash/public/cpp/shelf_item_delegate.h" |
#include "ash/shell.h" |
#include "ash/wm/window_util.h" |
@@ -260,7 +259,9 @@ |
ash::ShelfItemDelegate* GetAppItemController(const std::string& id) { |
const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(id); |
- return ash::Shell::Get()->shelf_model()->GetShelfItemDelegate(shelf_id); |
+ if (!shelf_id) |
+ return nullptr; |
+ return chrome_controller()->GetShelfItemDelegate(shelf_id); |
} |
ArcAppListPrefs* app_prefs() { return ArcAppListPrefs::Get(profile()); } |