chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h - Issue 1811523002: Enhance chrome.app.window API with better shelf integration

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/extension_app_window_launcher_controller.h

Issue 1811523002: Enhance chrome.app.window API with better shelf integration Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: [WIP] Rebase + browser tests. Added a new map that holds all the showInShelf windows. 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/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h

diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h

index a34ba49e8379ce2ee02ee70c7e501770ee92e7fa..c391627f21f279682253b1e463c2d5091253b81d 100644

--- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h

+++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_controller.h

@@ -67,6 +67,8 @@ class ExtensionAppWindowLauncherController

using AppControllerMap =

std::map<std::string, ExtensionAppWindowLauncherItemController*>;

using WindowToAppShelfIdMap = std::map<aura::Window*, std::string>;

+ using WindowControllerMap =

+ std::map<aura::Window*, ExtensionAppWindowLauncherItemController*>;

// A set of unowned AppWindowRegistry pointers for loaded users.

// Note that this will only be used with multiple users in the side by side

@@ -75,6 +77,7 @@ class ExtensionAppWindowLauncherController

// Map of app launcher id to controller.

AppControllerMap app_controller_map_;

+ WindowControllerMap window_controller_map_;

// Allows us to get from an aura::Window to the app shelf id.

WindowToAppShelfIdMap window_to_app_shelf_id_map_;