chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.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/app_shortcut_launcher_item_controller.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

« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_controller_ash.cc ('k') | chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7b13f69e7391ab70d035c057a02f7cb1ed670976..2e3ee3049a3751d2f12b1e34a5c90f80740ba9ec 100644

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

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

@@ -213,7 +213,8 @@ bool AppShortcutLauncherItemController::IsDraggable() {

}

bool AppShortcutLauncherItemController::CanPin() const {

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

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

+ AppListControllerDelegate::PIN_EDITABLE;

}

bool AppShortcutLauncherItemController::ShouldShowTooltip() {