| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 void SetActiveWindow(aura::Window* window); | 42 void SetActiveWindow(aura::Window* window); |
| 43 ui::BaseWindow* GetAppWindow(aura::Window* window); | 43 ui::BaseWindow* GetAppWindow(aura::Window* window); |
| 44 | 44 |
| 45 // LauncherItemController overrides: | 45 // LauncherItemController overrides: |
| 46 AppWindowLauncherItemController* AsAppWindowLauncherItemController() override; | 46 AppWindowLauncherItemController* AsAppWindowLauncherItemController() override; |
| 47 ash::ShelfAction ItemSelected(ui::EventType event_type, | 47 ash::ShelfAction ItemSelected(ui::EventType event_type, |
| 48 int event_flags, | 48 int event_flags, |
| 49 int64_t display_id, | 49 int64_t display_id, |
| 50 ash::ShelfLaunchSource source) override; | 50 ash::ShelfLaunchSource source) override; |
| 51 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; | 51 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; |
| 52 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override; |
| 52 void Close() override; | 53 void Close() override; |
| 53 | 54 |
| 54 // aura::WindowObserver overrides: | 55 // aura::WindowObserver overrides: |
| 55 void OnWindowPropertyChanged(aura::Window* window, | 56 void OnWindowPropertyChanged(aura::Window* window, |
| 56 const void* key, | 57 const void* key, |
| 57 intptr_t old) override; | 58 intptr_t old) override; |
| 58 | 59 |
| 59 // Get the number of running applications/incarnations of this. | 60 // Get the number of running applications/incarnations of this. |
| 60 size_t window_count() const { return windows_.size(); } | 61 size_t window_count() const { return windows_.size(); } |
| 61 | 62 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 92 // Pointer to the most recently active app window | 93 // Pointer to the most recently active app window |
| 93 ui::BaseWindow* last_active_window_ = nullptr; | 94 ui::BaseWindow* last_active_window_ = nullptr; |
| 94 | 95 |
| 95 // Scoped list of observed windows (for removal on destruction) | 96 // Scoped list of observed windows (for removal on destruction) |
| 96 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; | 97 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; |
| 97 | 98 |
| 98 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); | 99 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); |
| 99 }; | 100 }; |
| 100 | 101 |
| 101 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ | 102 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ |
| OLD | NEW |