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

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

Issue 2545923004: Remove LauncherItemController::type; use ShelfItems::type. (Closed)
Patch Set: Rebase; remove new LauncherItemController::TYPE_APP check. Created 4 years 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 04250addfca05be11fcd3ab3e0ef98a0cb3a989e..d9cf3d1a34fcc7b7a637d529d853cb3477053c11 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -236,12 +236,7 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
const ash::ShelfID shelf_id = shelf_delegate()->GetShelfIDForAppID(id);
if (!shelf_id)
return nullptr;
- LauncherItemController* controller =
- chrome_controller()->GetLauncherItemController(shelf_id);
- if (!controller)
- return nullptr;
- DCHECK_EQ(LauncherItemController::TYPE_APP, controller->type());
- return controller;
+ return chrome_controller()->GetLauncherItemController(shelf_id);
}
ArcAppListPrefs* app_prefs() { return ArcAppListPrefs::Get(profile()); }

Powered by Google App Engine
This is Rietveld 408576698