Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(892)

Side by Side Diff: chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h

Issue 2716403005: mash: Remove shelf app menu item objects. (Closed)
Patch Set: Address comments. Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <map>
9 #include <string> 8 #include <string>
10 9
11 #include "base/macros.h" 10 #include "base/macros.h"
12 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h" 11 #include "chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h"
13 12
14 namespace extensions { 13 namespace extensions {
15 class AppWindow; 14 class AppWindow;
16 } 15 }
17 16
18 class ChromeLauncherController; 17 class ChromeLauncherController;
19 18
19 // Shelf item delegate for extension app windows.
20 class ExtensionAppWindowLauncherItemController 20 class ExtensionAppWindowLauncherItemController
21 : public AppWindowLauncherItemController { 21 : public AppWindowLauncherItemController {
22 public: 22 public:
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 // LauncherItemController overrides: 32 // AppWindowLauncherItemController:
33 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; 33 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override;
34 34 void ExecuteCommand(uint32_t command_id, int event_flags) override;
35 protected:
36 // AppWindowLauncherItemController:
37 void OnWindowRemoved(ui::BaseWindow* window) override;
38 35
39 private: 36 private:
40 using WindowToAppWindow =
41 std::map<const ui::BaseWindow*, extensions::AppWindow*>;
42
43 WindowToAppWindow window_to_app_window_;
44
45 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController); 37 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController);
46 }; 38 };
47 39
48 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CON TROLLER_H_ 40 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CON TROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698