chrome/browser/ui/ash/app_list/app_list_controller_ash.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/app_list/app_list_controller_ash.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: TODO added 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/chromeos/arc/arc_auth_service.cc ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

index b9b8ee466fdede10257c6826164bd2696d654f61..0a057e6419fe3dd666f7fde55c57f15943374d2d 100644

--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

@@ -49,9 +49,7 @@ void AppListControllerDelegateAsh::UnpinApp(const std::string& extension_id) {

AppListControllerDelegate::Pinnable AppListControllerDelegateAsh::GetPinnable(

const std::string& extension_id) {

- return ChromeLauncherController::instance()->CanPin(extension_id)

- ? PIN_EDITABLE

- : PIN_FIXED;

+ return ChromeLauncherController::instance()->GetPinnable(extension_id);

}

void AppListControllerDelegateAsh::OnShowChildDialog() {