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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.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 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_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 void UpdateAppState(content::WebContents* contents, 47 void UpdateAppState(content::WebContents* contents,
48 AppState app_state) override; 48 AppState app_state) override;
49 ash::ShelfID GetShelfIDForWebContents( 49 ash::ShelfID GetShelfIDForWebContents(
50 content::WebContents* contents) override; 50 content::WebContents* contents) override;
51 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override; 51 void SetRefocusURLPatternForTest(ash::ShelfID id, const GURL& url) override;
52 ash::ShelfAction ActivateWindowOrMinimizeIfActive( 52 ash::ShelfAction ActivateWindowOrMinimizeIfActive(
53 ui::BaseWindow* window, 53 ui::BaseWindow* window,
54 bool allow_minimize) override; 54 bool allow_minimize) override;
55 void ActiveUserChanged(const std::string& user_email) override; 55 void ActiveUserChanged(const std::string& user_email) override;
56 void AdditionalUserAddedToSession(Profile* profile) override; 56 void AdditionalUserAddedToSession(Profile* profile) override;
57 ash::ShelfAppMenuItemList GetAppMenuItemsForTesting( 57 ash::ShelfItemDelegate::MenuItemList GetAppMenuItemsForTesting(
58 const ash::ShelfItem& item) override; 58 const ash::ShelfItem& item) override;
59 std::vector<content::WebContents*> GetV1ApplicationsFromAppId( 59 std::vector<content::WebContents*> GetV1ApplicationsFromAppId(
60 const std::string& app_id) override; 60 const std::string& app_id) override;
61 void ActivateShellApp(const std::string& app_id, int window_index) override; 61 void ActivateShellApp(const std::string& app_id, int window_index) override;
62 bool IsWebContentHandledByApplication(content::WebContents* web_contents, 62 bool IsWebContentHandledByApplication(content::WebContents* web_contents,
63 const std::string& app_id) override; 63 const std::string& app_id) override;
64 bool ContentCanBeHandledByGmailApp( 64 bool ContentCanBeHandledByGmailApp(
65 content::WebContents* web_contents) override; 65 content::WebContents* web_contents) override;
66 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override; 66 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
67 base::string16 GetAppListTitle( 67 base::string16 GetAppListTitle(
(...skipping 21 matching lines...) Expand all
89 // Pin the items set in the current profile's preferences. 89 // Pin the items set in the current profile's preferences.
90 void PinAppsFromPrefs(); 90 void PinAppsFromPrefs();
91 91
92 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>> 92 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>
93 app_id_to_item_delegate_; 93 app_id_to_item_delegate_;
94 94
95 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 95 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
96 }; 96 };
97 97
98 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 98 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698