| 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_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 | 297 |
| 298 // ash::ShelfItemDelegateManagerObserver: | 298 // ash::ShelfItemDelegateManagerObserver: |
| 299 void OnSetShelfItemDelegate(ash::ShelfID id, | 299 void OnSetShelfItemDelegate(ash::ShelfID id, |
| 300 ash::ShelfItemDelegate* item_delegate) override; | 300 ash::ShelfItemDelegate* item_delegate) override; |
| 301 | 301 |
| 302 // ash::ShelfModelObserver: | 302 // ash::ShelfModelObserver: |
| 303 void ShelfItemAdded(int index) override; | 303 void ShelfItemAdded(int index) override; |
| 304 void ShelfItemRemoved(int index, ash::ShelfID id) override; | 304 void ShelfItemRemoved(int index, ash::ShelfID id) override; |
| 305 void ShelfItemMoved(int start_index, int target_index) override; | 305 void ShelfItemMoved(int start_index, int target_index) override; |
| 306 void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override; | 306 void ShelfItemChanged(int index, const ash::ShelfItem& old_item) override; |
| 307 void ShelfStatusChanged() override; | |
| 308 | 307 |
| 309 // ash::ShellObserver: | 308 // ash::ShellObserver: |
| 310 void OnShelfAlignmentChanged(aura::Window* root_window) override; | 309 void OnShelfAlignmentChanged(aura::Window* root_window) override; |
| 311 | 310 |
| 312 // ash::WindowTreeHostManager::Observer: | 311 // ash::WindowTreeHostManager::Observer: |
| 313 void OnDisplayConfigurationChanged() override; | 312 void OnDisplayConfigurationChanged() override; |
| 314 | 313 |
| 315 // ExtensionRegistryObserver: | 314 // ExtensionRegistryObserver: |
| 316 void OnExtensionLoaded(content::BrowserContext* browser_context, | 315 void OnExtensionLoaded(content::BrowserContext* browser_context, |
| 317 const extensions::Extension* extension) override; | 316 const extensions::Extension* extension) override; |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 602 // The list of running & un-pinned applications for different users on hidden | 601 // The list of running & un-pinned applications for different users on hidden |
| 603 // desktops. | 602 // desktops. |
| 604 typedef std::vector<std::string> RunningAppListIds; | 603 typedef std::vector<std::string> RunningAppListIds; |
| 605 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; | 604 typedef std::map<std::string, RunningAppListIds> RunningAppListIdMap; |
| 606 RunningAppListIdMap last_used_running_application_order_; | 605 RunningAppListIdMap last_used_running_application_order_; |
| 607 | 606 |
| 608 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); | 607 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherController); |
| 609 }; | 608 }; |
| 610 | 609 |
| 611 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ | 610 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_H_ |
| OLD | NEW |