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

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

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Address comments. Created 4 years, 1 month 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> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 16 matching lines...) Expand all
27 ChromeLauncherController* controller); 27 ChromeLauncherController* controller);
28 28
29 ~ExtensionAppWindowLauncherItemController() override; 29 ~ExtensionAppWindowLauncherItemController() override;
30 30
31 void AddAppWindow(extensions::AppWindow* app_window); 31 void AddAppWindow(extensions::AppWindow* app_window);
32 32
33 // LauncherItemController overrides: 33 // LauncherItemController overrides:
34 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override; 34 ChromeLauncherAppMenuItems GetApplicationList(int event_flags) override;
35 ash::ShelfItemDelegate::PerformedAction ItemSelected( 35 ash::ShelfItemDelegate::PerformedAction ItemSelected(
36 const ui::Event& event) override; 36 const ui::Event& event) override;
37 base::string16 GetTitle() override;
38 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override; 37 ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
39 bool IsDraggable() override;
40 bool ShouldShowTooltip() override;
41 38
42 protected: 39 protected:
43 // AppWindowLauncherItemController: 40 // AppWindowLauncherItemController:
44 void OnWindowRemoved(ui::BaseWindow* window) override; 41 void OnWindowRemoved(ui::BaseWindow* window) override;
45 42
46 private: 43 private:
47 using WindowToAppWindow = 44 using WindowToAppWindow =
48 std::map<const ui::BaseWindow*, extensions::AppWindow*>; 45 std::map<const ui::BaseWindow*, extensions::AppWindow*>;
49 46
50 WindowToAppWindow window_to_app_window_; 47 WindowToAppWindow window_to_app_window_;
51 48
52 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController); 49 DISALLOW_COPY_AND_ASSIGN(ExtensionAppWindowLauncherItemController);
53 }; 50 };
54 51
55 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CON TROLLER_H_ 52 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_EXTENSION_APP_WINDOW_LAUNCHER_ITEM_CON TROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698