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

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

Issue 2055553004: arc: Support pinned apps across Arc-enabled and Arc-disabled platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup and update Created 4 years, 6 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/launcher_context_menu_unittest.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index 27a0acdc8dd0248b15d540ed0273b2b8a05aa76f..dd4aa56af9c935f83c9a7b1c2f93fcde5d81d9e5 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -35,7 +35,14 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
void SetUp() override {
arc_test_.SetUp(profile_.get());
ash::test::AshTestBase::SetUp();
- controller_.reset(new ChromeLauncherController(profile(), &shelf_model_));
+
+ ash::ShelfItem app_list;
+ app_list.type = ash::TYPE_APP_LIST;
+ shelf_model_.Add(app_list);
+
+ controller_.reset(new ChromeLauncherController(
+ profile(), ash::Shell::GetInstance()->shelf_model()));
+ controller_->Init();
}
void TearDown() override {

Powered by Google App Engine
This is Rietveld 408576698