chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.cc - Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash.

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_window_launcher_item_controller.cc

Issue 2391253004: Use mojo Shelf interfaces for both mash and classic ash. (Closed)

Patch Set: Address most comments, except manifest, need to sync. Created 4 years, 2 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/chrome_shell_delegate.cc ('K') | « chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index b703325a4b224d921e3a60fe3d6ba89c95ee7e79..7f1e3028dca558639bcb31b100ac1090d4b45355 100644

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

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

@@ -140,8 +140,8 @@ AppWindowLauncherItemController::ItemSelected(const ui::Event& event) {

}

base::string16 AppWindowLauncherItemController::GetTitle() {

- return LauncherControllerHelper::GetAppTitle(

- launcher_controller()->GetProfile(), app_id());

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

+ app_id());

}

bool AppWindowLauncherItemController::IsDraggable() {

@@ -150,7 +150,7 @@ bool AppWindowLauncherItemController::IsDraggable() {

}

bool AppWindowLauncherItemController::CanPin() const {

- return GetPinnableForAppID(app_id(), launcher_controller()->GetProfile()) ==

+ return GetPinnableForAppID(app_id(), launcher_controller()->profile()) ==

AppListControllerDelegate::PIN_EDITABLE;

}