Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3530)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

Issue 2251313002: Revert of arc: Fix crash on Arc window close. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2785
Patch Set: 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 | « no previous file | chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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..68a6babfcf18185279894721a206d8b8052668ea 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,8 @@
private:
class AppWindow;
- struct TaskInfo;
using TaskIdToAppWindow = std::map<int, std::unique_ptr<AppWindow>>;
- using TaskIdToTaskInfoMap = std::map<int, std::unique_ptr<TaskInfo>>;
using AppControllerMap =
std::map<std::string, ArcAppWindowLauncherItemController*>;
@@ -100,7 +98,7 @@
AppWindow* GetAppWindowForTask(int task_id);
- void MayAttachContollerToWindow(aura::Window* window);
+ void CheckForAppWindowWidget(aura::Window* window);
void SetOrientationLockForAppWindow(AppWindow* app_window);
@@ -112,7 +110,6 @@
ash::ShelfDelegate* shelf_delegate_;
int active_task_id_ = -1;
TaskIdToAppWindow task_id_to_app_window_;
- TaskIdToTaskInfoMap task_id_to_task_info_;
AppControllerMap app_controller_map_;
std::vector<aura::Window*> observed_windows_;
Profile* observed_profile_ = nullptr;
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698