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

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

Issue 2184103003: arc: Implement proper Arc window activation for task moving to front. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 void OnMaximizeModeEnded() override; 72 void OnMaximizeModeEnded() override;
73 73
74 // ArcAppListPrefs::Observer: 74 // ArcAppListPrefs::Observer:
75 void OnAppReadyChanged(const std::string& app_id, bool ready) override; 75 void OnAppReadyChanged(const std::string& app_id, bool ready) override;
76 void OnAppRemoved(const std::string& app_id) override; 76 void OnAppRemoved(const std::string& app_id) override;
77 void OnTaskCreated(int task_id, 77 void OnTaskCreated(int task_id,
78 const std::string& package_name, 78 const std::string& package_name,
79 const std::string& activity) override; 79 const std::string& activity) override;
80 void OnTaskDestroyed(int task_id) override; 80 void OnTaskDestroyed(int task_id) override;
81 void OnTaskSetActive(int32_t task_id) override; 81 void OnTaskSetActive(int32_t task_id) override;
82 void OnTaskMovedToFront(int32_t task_id) override;
82 void OnTaskOrientationLockRequested( 83 void OnTaskOrientationLockRequested(
83 int32_t task_id, 84 int32_t task_id,
84 const arc::mojom::OrientationLock orientation_lock) override; 85 const arc::mojom::OrientationLock orientation_lock) override;
85 86
86 private: 87 private:
87 class AppWindow; 88 class AppWindow;
88 89
89 using TaskIdToAppWindow = std::map<int, std::unique_ptr<AppWindow>>; 90 using TaskIdToAppWindow = std::map<int, std::unique_ptr<AppWindow>>;
90 using AppControllerMap = 91 using AppControllerMap =
91 std::map<std::string, ArcAppWindowLauncherItemController*>; 92 std::map<std::string, ArcAppWindowLauncherItemController*>;
(...skipping 20 matching lines...) Expand all
112 TaskIdToAppWindow task_id_to_app_window_; 113 TaskIdToAppWindow task_id_to_app_window_;
113 AppControllerMap app_controller_map_; 114 AppControllerMap app_controller_map_;
114 std::vector<aura::Window*> observed_windows_; 115 std::vector<aura::Window*> observed_windows_;
115 Profile* observed_profile_ = nullptr; 116 Profile* observed_profile_ = nullptr;
116 bool observing_shell_ = false; 117 bool observing_shell_ = false;
117 118
118 DISALLOW_COPY_AND_ASSIGN(ArcAppWindowLauncherController); 119 DISALLOW_COPY_AND_ASSIGN(ArcAppWindowLauncherController);
119 }; 120 };
120 121
121 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_ 122 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_ARC_APP_WINDOW_LAUNCHER_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698