chrome/browser/ui/ash/launcher/launcher_context_menu.cc - Issue 2090133003: Moved methods that don't rely on internal state out of ChromeLauncherController.

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/launcher_context_menu.cc

Issue 2090133003: Moved methods that don't rely on internal state out of ChromeLauncherController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: nit changes 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

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc ('k') | chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 91b7d27106f692b62150be936c7359979c5b2284..f050a3b53ee9913f4a9a6212c4cdd66c6c1db6e5 100644

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

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

@@ -18,6 +18,7 @@

#include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"

#include "chrome/browser/ui/ash/launcher/arc_launcher_context_menu.h"

#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"

+#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"

#include "chrome/browser/ui/ash/launcher/desktop_shell_launcher_context_menu.h"

#include "chrome/browser/ui/ash/launcher/extension_launcher_context_menu.h"

#include "chrome/common/pref_names.h"

@@ -159,7 +160,7 @@ void LauncherContextMenu::AddPinMenu() {

DCHECK(item_.id);

int menu_pin_string_id;

const std::string app_id = controller_->GetAppIDForShelfID(item_.id);

- switch (controller_->GetPinnable(app_id)) {

+ switch (GetPinnableForAppID(app_id, controller_->GetProfile())) {

case AppListControllerDelegate::PIN_EDITABLE:

menu_pin_string_id = controller_->IsPinned(item_.id)

? IDS_LAUNCHER_CONTEXT_MENU_UNPIN