Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <memory> | 9 #include <memory> |
| 10 | 10 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 97 BrowserShortcutLauncherItemController* | 97 BrowserShortcutLauncherItemController* |
| 98 GetBrowserShortcutLauncherItemController() override; | 98 GetBrowserShortcutLauncherItemController() override; |
| 99 bool ShelfBoundsChangesProbablyWithUser( | 99 bool ShelfBoundsChangesProbablyWithUser( |
| 100 ash::WmShelf* shelf, | 100 ash::WmShelf* shelf, |
| 101 const AccountId& account_id) const override; | 101 const AccountId& account_id) const override; |
| 102 void OnUserProfileReadyToSwitch(Profile* profile) override; | 102 void OnUserProfileReadyToSwitch(Profile* profile) override; |
| 103 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; | 103 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; |
| 104 const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override; | 104 const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override; |
| 105 void AttachProfile(Profile* profile_to_attach) override; | 105 void AttachProfile(Profile* profile_to_attach) override; |
| 106 | 106 |
| 107 ash::ShelfModel* shelf_model() const { return model_; } | |
|
James Cook
2017/04/26 01:03:26
Why not provide a GetShelfModel() on ChromeLaunche
msw
2017/04/26 01:35:14
Yes, I plan to merge CLC and CLCImpl in an imminen
| |
| 108 | |
| 107 // Access to the BrowserStatusMonitor for tests. | 109 // Access to the BrowserStatusMonitor for tests. |
| 108 BrowserStatusMonitor* browser_status_monitor_for_test() { | 110 BrowserStatusMonitor* browser_status_monitor_for_test() { |
| 109 return browser_status_monitor_.get(); | 111 return browser_status_monitor_.get(); |
| 110 } | 112 } |
| 111 | 113 |
| 112 // Access to the AppWindowLauncherController list for tests. | 114 // Access to the AppWindowLauncherController list for tests. |
| 113 const std::vector<std::unique_ptr<AppWindowLauncherController>>& | 115 const std::vector<std::unique_ptr<AppWindowLauncherController>>& |
| 114 app_window_controllers_for_test() { | 116 app_window_controllers_for_test() { |
| 115 return app_window_controllers_; | 117 return app_window_controllers_; |
| 116 } | 118 } |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 275 typedef std::vector<std::string> RunningAppListIds; | 277 typedef std::vector<std::string> RunningAppListIds; |
| 276 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; | 278 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; |
| 277 RunningAppListIdMap last_used_running_application_order_; | 279 RunningAppListIdMap last_used_running_application_order_; |
| 278 | 280 |
| 279 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_; | 281 base::WeakPtrFactory<ChromeLauncherControllerImpl> weak_ptr_factory_; |
| 280 | 282 |
| 281 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); | 283 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerImpl); |
| 282 }; | 284 }; |
| 283 | 285 |
| 284 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ | 286 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_IMPL_H_ |
| OLD | NEW |