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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_shortcut_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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROLLER _H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h" 9 #include "chrome/browser/ui/ash/launcher/launcher_item_controller.h"
10 #include "chrome/browser/ui/browser_list.h" 10 #include "chrome/browser/ui/browser_list.h"
(...skipping 25 matching lines...) Expand all
36 void UpdateBrowserItemState(); 36 void UpdateBrowserItemState();
37 37
38 // Sets the shelf id for the browser window if the browser is represented. 38 // Sets the shelf id for the browser window if the browser is represented.
39 void SetShelfIDForBrowserWindowContents(Browser* browser, 39 void SetShelfIDForBrowserWindowContents(Browser* browser,
40 content::WebContents* web_contents); 40 content::WebContents* web_contents);
41 41
42 // Check if there is any active browsers windows. 42 // Check if there is any active browsers windows.
43 bool IsListOfActiveBrowserEmpty(); 43 bool IsListOfActiveBrowserEmpty();
44 44
45 // LauncherItemController overrides: 45 // LauncherItemController overrides:
46 ash::ShelfAction ItemSelected(ui::EventType event_type, 46 void ItemSelected(std::unique_ptr<ui::Event> event,
47 int event_flags, 47 int64_t display_id,
48 int64_t display_id, 48 ash::ShelfLaunchSource source,
49 ash::ShelfLaunchSource source) override; 49 const ItemSelectedCallback& callback) override;
50 ash::ShelfAppMenuItemList GetAppMenuItems(int event_flags) override; 50 std::vector<ash::mojom::MenuItemPtr> GetAppMenuItems(
51 void ExecuteCommand(uint32_t command_id, int event_flags) override; 51 int event_flags) override;
52 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override;
52 void Close() override; 53 void Close() override;
53 54
54 private: 55 private:
55 // Activate a browser - or advance to the next one on the list. 56 // Activate a browser - or advance to the next one on the list.
56 // Returns the action performed. Should be one of SHELF_ACTION_NONE, 57 // Returns the action performed. Should be one of SHELF_ACTION_NONE,
57 // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_NEW_WINDOW_CREATED. 58 // SHELF_ACTION_WINDOW_ACTIVATED, or SHELF_ACTION_NEW_WINDOW_CREATED.
58 ash::ShelfAction ActivateOrAdvanceToNextBrowser(); 59 ash::ShelfAction ActivateOrAdvanceToNextBrowser();
59 60
60 // Returns true when the given |browser| is listed in the browser application 61 // Returns true when the given |browser| is listed in the browser application
61 // list. 62 // list.
(...skipping 12 matching lines...) Expand all
74 // The cached list of open browser windows shown in an application menu. 75 // The cached list of open browser windows shown in an application menu.
75 BrowserList::BrowserVector browser_menu_items_; 76 BrowserList::BrowserVector browser_menu_items_;
76 77
77 // Registers for notifications of closing browser windows. 78 // Registers for notifications of closing browser windows.
78 content::NotificationRegistrar registrar_; 79 content::NotificationRegistrar registrar_;
79 80
80 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController); 81 DISALLOW_COPY_AND_ASSIGN(BrowserShortcutLauncherItemController);
81 }; 82 };
82 83
83 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_ 84 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_SHORTCUT_LAUNCHER_ITEM_CONTROL LER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698