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

Side by Side Diff: chrome/browser/ui/ash/launcher/arc_app_window_launcher_controller.h

Issue 2315903002: arc: Fix crash in multi-user env on task stop. (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 std::map<std::string, ArcAppWindowLauncherItemController*>; 92 std::map<std::string, ArcAppWindowLauncherItemController*>;
93 93
94 void StartObserving(Profile* profile); 94 void StartObserving(Profile* profile);
95 void StopObserving(Profile* profile); 95 void StopObserving(Profile* profile);
96 96
97 void RegisterApp(AppWindow* app_window); 97 void RegisterApp(AppWindow* app_window);
98 void UnregisterApp(AppWindow* app_window, bool close_controller); 98 void UnregisterApp(AppWindow* app_window, bool close_controller);
99 99
100 AppWindow* GetAppWindowForTask(int task_id); 100 AppWindow* GetAppWindowForTask(int task_id);
101 101
102 void MayAttachContollerToWindow(aura::Window* window); 102 void MaybeAttachContollerToWindow(aura::Window* window);
Mr4D (OOO till 08-26) 2016/09/07 20:17:34 Why rename "May" -> "Maybe"? That sounds really od
khmel 2016/09/07 21:01:47 Based on my previous reviews :) There is a style t
103 void MaybeAttachContollerToWindows();
103 104
104 void SetOrientationLockForAppWindow(AppWindow* app_window); 105 void SetOrientationLockForAppWindow(AppWindow* app_window);
105 106
106 // AppWindowLauncherController: 107 // AppWindowLauncherController:
107 AppWindowLauncherItemController* ControllerForWindow( 108 AppWindowLauncherItemController* ControllerForWindow(
108 aura::Window* window) override; 109 aura::Window* window) override;
109 110
110 // Not owned 111 // Not owned
111 ash::ShelfDelegate* shelf_delegate_; 112 ash::ShelfDelegate* shelf_delegate_;
112 int active_task_id_ = -1; 113 int active_task_id_ = -1;
113 TaskIdToAppWindow task_id_to_app_window_; 114 TaskIdToAppWindow task_id_to_app_window_;
114 TaskIdToShelfAppIdMap task_id_to_shelf_app_id_; 115 TaskIdToShelfAppIdMap task_id_to_shelf_app_id_;
115 AppControllerMap app_controller_map_; 116 AppControllerMap app_controller_map_;
116 std::vector<aura::Window*> observed_windows_; 117 std::vector<aura::Window*> observed_windows_;
117 Profile* observed_profile_ = nullptr; 118 Profile* observed_profile_ = nullptr;
118 bool observing_shell_ = false; 119 bool observing_shell_ = false;
119 120
120 DISALLOW_COPY_AND_ASSIGN(ArcAppWindowLauncherController); 121 DISALLOW_COPY_AND_ASSIGN(ArcAppWindowLauncherController);
121 }; 122 };
122 123
123 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 124 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698