| OLD | NEW |
| 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_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTRO
LLER_H_ | 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTRO
LLER_H_ |
| 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTRO
LLER_H_ | 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTRO
LLER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 ExtensionAppWindowLauncherItemController( | 23 ExtensionAppWindowLauncherItemController( |
| 24 const std::string& app_id, | 24 const std::string& app_id, |
| 25 const std::string& launch_id, | 25 const std::string& launch_id, |
| 26 ChromeLauncherController* controller); | 26 ChromeLauncherController* controller); |
| 27 | 27 |
| 28 ~ExtensionAppWindowLauncherItemController() override; | 28 ~ExtensionAppWindowLauncherItemController() override; |
| 29 | 29 |
| 30 void AddAppWindow(extensions::AppWindow* app_window); | 30 void AddAppWindow(extensions::AppWindow* app_window); |
| 31 | 31 |
| 32 // AppWindowLauncherItemController: | 32 // AppWindowLauncherItemController: |
| 33 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; | 33 std::vector<ash::mojom::MenuItemPtr> GetAppMenuItems( |
| 34 void ExecuteCommand(uint32_t command_id, int event_flags) override; | 34 int event_flags) override; |
| 35 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override; |
| 35 | 36 |
| 36 private: | 37 private: |
| 37 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController); | 38 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController); |
| 38 }; | 39 }; |
| 39 | 40 |
| 40 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CON
TROLLER_H_ | 41 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CON
TROLLER_H_ |
| OLD | NEW |