chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc - Issue 2927693002: mash: Limit ShelfWindowWatcher to panels and dialogs.

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 2927693002: mash: Limit ShelfWindowWatcher to panels and dialogs. (Closed)

Patch Set: Disable WindowSelectorTest.MultipleDisplays in mash. Created 3 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

« ash/shelf/shelf_window_watcher_unittest.cc ('K') | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h » ('j') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc » ('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 8df5123dff8b528cedcb9e70d128420b462ecaf9..c3677cf61e353309922081518792e601b8223443 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

@@ -288,6 +288,7 @@ void ArcAppWindowLauncherController::AttachControllerToWindowIfNeeded(

if (GetAppWindowForTask(task_id))

return;

+ window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_APP);

window->SetProperty(aura::client::kAppType,

static_cast<int>(ash::AppType::ARC_APP));