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

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

Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem. (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
(...skipping 26 matching lines...) Expand all
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 void ItemSelected(std::unique_ptr<ui::Event> event,
48 int event_flags, 48 int64_t display_id,
49 int64_t display_id, 49 ash::ShelfLaunchSource source,
50 ash::ShelfLaunchSource source) override; 50 const ItemSelectedCallback& callback) override;
51 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; 51 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
52 void ExecuteCommand(uint32_t command_id, int event_flags) override;
53 void Close() override; 52 void Close() override;
54 53
55 // aura::WindowObserver overrides: 54 // aura::WindowObserver overrides:
56 void OnWindowPropertyChanged(aura::Window* window, 55 void OnWindowPropertyChanged(aura::Window* window,
57 const void* key, 56 const void* key,
58 intptr_t old) override; 57 intptr_t old) override;
59 58
60 // Get the number of running applications/incarnations of this. 59 // Get the number of running applications/incarnations of this.
61 size_t window_count() const { return windows_.size(); } 60 size_t window_count() const { return windows_.size(); }
62 61
(...skipping 30 matching lines...) Expand all
93 // Pointer to the most recently active app window 92 // Pointer to the most recently active app window
94 ui::BaseWindow* last_active_window_ = nullptr; 93 ui::BaseWindow* last_active_window_ = nullptr;
95 94
96 // Scoped list of observed windows (for removal on destruction) 95 // Scoped list of observed windows (for removal on destruction)
97 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 96 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
98 97
99 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController); 98 DISALLOW_COPY_AND_ASSIGN(AppWindowLauncherItemController);
100 }; 99 };
101 100
102 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_ 101 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_WINDOW_LAUNCHER_ITEM_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698