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

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

Issue 2718563008: mash: Use mojo for ShelfItemDelegate and [app] MenuItem. (Closed)
Patch Set: Cleanup; fix ash_shell compile and a couple tests. 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 23 matching lines...) Expand all
34 ~AppShortcutLauncherItemController() override; 34 ~AppShortcutLauncherItemController() override;
35 35
36 static AppShortcutLauncherItemController* Create( 36 static AppShortcutLauncherItemController* Create(
37 const std::string& app_id, 37 const std::string& app_id,
38 const std::string& launch_id, 38 const std::string& launch_id,
39 ChromeLauncherController* controller); 39 ChromeLauncherController* controller);
40 40
41 std::vector<content::WebContents*> GetRunningApplications(); 41 std::vector<content::WebContents*> GetRunningApplications();
42 42
43 // LauncherItemController overrides: 43 // LauncherItemController overrides:
44 ash::ShelfAction ItemSelected(ui::EventType event_type, 44 void ItemSelected(std::unique_ptr<ui::Event> event,
45 int event_flags, 45 int64_t display_id,
46 int64_t display_id, 46 ash::ShelfLaunchSource source,
47 ash::ShelfLaunchSource source) override; 47 const ItemSelectedCallback& callback) override;
48 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; 48 MenuItemList GetAppMenuItems(int event_flags) override;
49 void ExecuteCommand(uint32_t command_id, int event_flags) override; 49 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
50 void Close() override; 50 void Close() override;
51 51
52 // Get the refocus url pattern, which can be used to identify this application 52 // Get the refocus url pattern, which can be used to identify this application
53 // from a URL link. 53 // from a URL link.
54 const GURL& refocus_url() const { return refocus_url_; } 54 const GURL& refocus_url() const { return refocus_url_; }
55 // Set the refocus url pattern. Used by unit tests. 55 // Set the refocus url pattern. Used by unit tests.
56 void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; } 56 void set_refocus_url(const GURL& refocus_url) { refocus_url_ = refocus_url; }
57 57
58 ChromeLauncherController* controller() { return chrome_launcher_controller_; } 58 ChromeLauncherController* controller() { return chrome_launcher_controller_; }
59 59
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 ChromeLauncherController* chrome_launcher_controller_; 99 ChromeLauncherController* chrome_launcher_controller_;
100 100
101 // The cached list of open app web contents shown in an application menu. 101 // The cached list of open app web contents shown in an application menu.
102 std::vector<content::WebContents*> app_menu_items_; 102 std::vector<content::WebContents*> app_menu_items_;
103 103
104 DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController); 104 DISALLOW_COPY_AND_ASSIGN(AppShortcutLauncherItemController);
105 }; 105 };
106 106
107 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_ H_ 107 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_APP_SHORTCUT_LAUNCHER_ITEM_CONTROLLER_ H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698