chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc - Issue 1919593003: arc: Prevent showing Opt-in UI when it is not expected.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1919593003: arc: Prevent showing Opt-in UI when it is not expected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: refactore to use GetPinnable Created 4 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

« chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/extension_launcher_context_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

index a27a51ae946f27d4b48bd73bce42e047132f9a71..92cdd60488b06e1538d96fe1cb64fd8b2ed50c4d 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -273,7 +273,8 @@ class TestV2AppLauncherItemController : public LauncherItemController {

}

bool IsDraggable() override { return false; }

bool CanPin() const override {

- return launcher_controller()->CanPin(app_id());

+ return launcher_controller()->GetPinnable(app_id()) ==

+ AppListControllerDelegate::PIN_EDITABLE;

}

bool ShouldShowTooltip() override { return false; }

@@ -1053,10 +1054,14 @@ TEST_F(ChromeLauncherControllerTest, MergePolicyAndUserPrefPinnedApps) {

EXPECT_TRUE(launcher_controller_->IsAppPinned(extension2_->id()));

// Check user can manually pin or unpin these apps

- EXPECT_TRUE(launcher_controller_->CanPin(extension1_->id()));

- EXPECT_FALSE(launcher_controller_->CanPin(extension2_->id()));

- EXPECT_TRUE(launcher_controller_->CanPin(extension3_->id()));

- EXPECT_FALSE(launcher_controller_->CanPin(extension4_->id()));

+ EXPECT_EQ(AppListControllerDelegate::PIN_EDITABLE,

+ launcher_controller_->GetPinnable(extension1_->id()));

+ EXPECT_EQ(AppListControllerDelegate::PIN_FIXED,

+ launcher_controller_->GetPinnable(extension2_->id()));

+ EXPECT_EQ(AppListControllerDelegate::PIN_EDITABLE,

+ launcher_controller_->GetPinnable(extension3_->id()));

+ EXPECT_EQ(AppListControllerDelegate::PIN_FIXED,

+ launcher_controller_->GetPinnable(extension4_->id()));

// Check the order of shelf pinned apps

EXPECT_EQ("AppList, App2, App4, App1, Chrome, App3", GetPinnedAppStatus());