chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h - Issue 2282023002: arc: Support window recreation.

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

Issue 2282023002: arc: Support window recreation. (Closed)

Patch Set: use SetTaskActive instead of Launch Created 4 years, 4 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/app_list/arc/arc_app_utils.cc ('k') | chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc » ('j') | chrome/browser/ui/ash/launcher/arc_app_window_launcher_item_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 181f70efe364e7b6f8ed40495e7d39d6a1b77561..a233b99c48341f94541e5576842d663fdc38039d 100644

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

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

@@ -85,10 +85,9 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,

private:

class AppWindow;

- struct TaskInfo;

using TaskIdToAppWindow = std::map<int, std::unique_ptr<AppWindow>>;

- using TaskIdToTaskInfoMap = std::map<int, std::unique_ptr<TaskInfo>>;

+ using TaskIdToShelfAppIdMap = std::map<int, std::string>;

using AppControllerMap =

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

@@ -96,7 +95,7 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,

void StopObserving(Profile* profile);

void RegisterApp(AppWindow* app_window);

- void UnregisterApp(AppWindow* app_window);

+ void UnregisterApp(AppWindow* app_window, bool close_controller);

AppWindow* GetAppWindowForTask(int task_id);

@@ -112,7 +111,7 @@ class ArcAppWindowLauncherController : public AppWindowLauncherController,

ash::ShelfDelegate* shelf_delegate_;

int active_task_id_ = -1;

TaskIdToAppWindow task_id_to_app_window_;

- TaskIdToTaskInfoMap task_id_to_task_info_;

+ TaskIdToShelfAppIdMap task_id_to_shelf_app_id_;

AppControllerMap app_controller_map_;

std::vector<aura::Window*> observed_windows_;

Profile* observed_profile_ = nullptr;