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

Side by Side Diff: chrome/browser/ui/ash/launcher/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 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
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/scoped_observer.h" 12 #include "base/scoped_observer.h"
13 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 13 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
14 #include "ui/aura/window_observer.h" 14 #include "ui/aura/window_observer.h"
15 15
16 namespace aura { 16 namespace aura {
17 class Window; 17 class Window;
18 } 18 }
19 19
20 namespace ui { 20 namespace ui {
21 class BaseWindow; 21 class BaseWindow;
22 } 22 }
23 23
24 class ChromeLauncherController; 24 class ChromeLauncherController;
25 25
26 // This is a LauncherItemController for abstract app windows. There is one 26 // This is a LauncherItemController for abstract app windows (extension or ARC).
27 // instance per app, per launcher id. For apps with multiple windows, each item 27 // There is one instance per app, per launcher id. For apps with multiple
28 // controller keeps track of all windows associated with the app and their 28 // windows, each item controller keeps track of all windows associated with the
29 // activation order. Instances are owned by ash::ShelfModel. 29 // app and their activation order. Instances are owned by ash::ShelfModel.
30 // 30 //
31 // Tests are in chrome_launcher_controller_impl_browsertest.cc 31 // Tests are in chrome_launcher_controller_impl_browsertest.cc
32 class AppWindowLauncherItemController : public LauncherItemController, 32 class AppWindowLauncherItemController : public LauncherItemController,
33 public aura::WindowObserver { 33 public aura::WindowObserver {
34 public: 34 public:
35 using WindowList = std::list<ui::BaseWindow*>; 35 using WindowList = std::list<ui::BaseWindow*>;
36 36
37 ~AppWindowLauncherItemController() override; 37 ~AppWindowLauncherItemController() override;
38 38
39 void AddWindow(ui::BaseWindow* window); 39 void AddWindow(ui::BaseWindow* window);
40 void RemoveWindow(ui::BaseWindow* window); 40 void RemoveWindow(ui::BaseWindow* window);
41 41
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, int 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
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_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698