Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(779)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

Issue 2798173002: mash: Remove ChromeLauncherController's |id_to_item_controller_map_|. (Closed)
Patch Set: Address comment; fix browser tests. Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 b2bf0b83064647d8fd7900f0801ba39d18a2e402..8798149fe7276fa0a9275c12852ee8a2d72e7255 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -3,6 +3,7 @@
// 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"
@@ -259,9 +260,7 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
ash::ShelfItemDelegate* GetAppItemController(const std::string& id) {
const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(id);
- if (!shelf_id)
- return nullptr;
- return chrome_controller()->GetShelfItemDelegate(shelf_id);
+ return ash::Shell::Get()->shelf_model()->GetShelfItemDelegate(shelf_id);
}
ArcAppListPrefs* app_prefs() { return ArcAppListPrefs::Get(profile()); }

Powered by Google App Engine
This is Rietveld 408576698