chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc - Issue 1921403002: Pin apps from prefs on the mash shelf.

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 1921403002: Pin apps from prefs on the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Only use ChromeMashShelfController with use_ash=1. 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/chrome_launcher_prefs.cc ('k') | chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc » ('j') | no next file with comments »
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 2e3ee3049a3751d2f12b1e34a5c90f80740ba9ec..14e40467e091c815b172466ce0997b224c506f1b 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

@@ -13,6 +13,7 @@

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

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

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

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

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

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"

@@ -200,7 +201,8 @@ AppShortcutLauncherItemController::ItemSelected(const ui::Event& event) {

}

base::string16 AppShortcutLauncherItemController::GetTitle() {

- return GetAppTitle();

+ return LauncherControllerHelper::GetAppTitle(launcher_controller()->profile(),

+ app_id());

}

ash::ShelfMenuModel* AppShortcutLauncherItemController::CreateApplicationMenu(