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

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

Issue 2257923002: arc: Handle non-launchable apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: Created 4 years, 4 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 4c63e73f912ae6ccc12f22570ea8a7de30419100..16880520a727338379af87e6ef9b09ba7173f7e2 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -172,7 +172,9 @@ TEST_F(LauncherContextMenuTest,
// Verifies contextmenu items for Arc app
TEST_F(LauncherContextMenuTest, ArcLauncherContextMenuItemCheck) {
arc_test().app_instance()->RefreshAppList();
- arc_test().app_instance()->SendRefreshAppList(arc_test().fake_apps());
+ arc_test().app_instance()->SendRefreshAppList(
+ std::vector<arc::mojom::AppInfo>(arc_test().fake_apps().begin(),
+ arc_test().fake_apps().begin() + 1));
const std::string app_id = ArcAppTest::GetAppId(arc_test().fake_apps()[0]);
controller()->PinAppWithID(app_id);
@@ -219,4 +221,17 @@ TEST_F(LauncherContextMenuTest, ArcLauncherContextMenuItemCheck) {
EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_PIN));
EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
+
+ // Arc non-launchable app is running.
+ const std::string app_id2 = ArcAppTest::GetAppId(arc_test().fake_apps()[1]);
+ arc_test().app_instance()->SendTaskCreated(2, arc_test().fake_apps()[1]);
+ item.id = controller()->GetShelfIDForAppID(app_id2);
+ ASSERT_TRUE(item.id);
+ menu.reset(new ArcLauncherContextMenu(controller(), &item, wm_shelf));
+
+ EXPECT_FALSE(
+ IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_OPEN_NEW));
+ EXPECT_FALSE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_PIN));
+ EXPECT_TRUE(IsItemPresentInMenu(menu.get(), LauncherContextMenu::MENU_CLOSE));
+ EXPECT_TRUE(menu->IsCommandIdEnabled(LauncherContextMenu::MENU_CLOSE));
}
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_unittest.cc ('k') | components/arc/common/app.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698