| Index: chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h
|
| diff --git a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h
|
| index 514dbf39121795a0bf6922f17aaae5ce634eb140..68e6ec87a3190a2e9fed063919e1bafd8627d100 100644
|
| --- a/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h
|
| +++ b/chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h
|
| @@ -5,7 +5,6 @@
|
| #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
|
| #define CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
|
|
|
| -#include <map>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| @@ -29,19 +28,11 @@ class ExtensionAppWindowLauncherItemController
|
|
|
| void AddAppWindow(extensions::AppWindow* app_window);
|
|
|
| - // LauncherItemController overrides:
|
| - ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
|
| -
|
| - protected:
|
| // AppWindowLauncherItemController:
|
| - void OnWindowRemoved(ui::BaseWindow* window) override;
|
| + ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
|
| + void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
|
|
|
| private:
|
| - using WindowToAppWindow =
|
| - std::map<const ui::BaseWindow*, extensions::AppWindow*>;
|
| -
|
| - WindowToAppWindow window_to_app_window_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController);
|
| };
|
|
|
|
|