chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2900783003: Handle app custom icon via aura::Window property.

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

Issue 2900783003: Handle app custom icon via aura::Window property. (Closed)

Patch Set: nits, discard owner from _item_controller, make SetAppIcon non-static Created 3 years, 7 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/arc_app_window.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.h » ('j') | components/exo/shell_surface.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index abbf06231177e11fa94754a6d9159371133be81a..9c109cb38abcd62ae49b18eed44507c284c82438 100644

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

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

@@ -548,7 +548,7 @@ ArcAppWindowLauncherController::AttachControllerToTask(

std::unique_ptr<ArcAppWindowLauncherItemController> controller =

base::MakeUnique<ArcAppWindowLauncherItemController>(

- app_shelf_id.ToString(), owner());

+ app_shelf_id.ToString());

ArcAppWindowLauncherItemController* item_controller = controller.get();

const ash::ShelfID shelf_id(app_shelf_id.ToString());

if (!owner()->GetItem(shelf_id)) {