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

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

Issue 2800263002: Revert of mash: Remove ChromeLauncherController's |id_to_item_controller_map_|. (Closed)
Patch Set: Created 3 years, 8 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 <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" 11 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
12 12
13 class ChromeLauncherControllerMus : public ChromeLauncherController { 13 class ChromeLauncherControllerMus : public ChromeLauncherController {
14 public: 14 public:
15 ChromeLauncherControllerMus(); 15 ChromeLauncherControllerMus();
16 ~ChromeLauncherControllerMus() override; 16 ~ChromeLauncherControllerMus() override;
17 17
18 // ChromeLauncherController: 18 // ChromeLauncherController:
19 ash::ShelfID CreateAppLauncherItem( 19 ash::ShelfID CreateAppLauncherItem(
20 std::unique_ptr<ash::ShelfItemDelegate> item_delegate, 20 std::unique_ptr<ash::ShelfItemDelegate> item_delegate,
21 ash::ShelfItemStatus status) override; 21 ash::ShelfItemStatus status) override;
22 const ash::ShelfItem* GetItem(ash::ShelfID id) const override; 22 const ash::ShelfItem* GetItem(ash::ShelfID id) const override;
23 void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override; 23 void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override;
24 void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override; 24 void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override;
25 void SetShelfItemDelegate(
26 ash::ShelfID id,
27 std::unique_ptr<ash::ShelfItemDelegate> item_delegate) override;
25 void CloseLauncherItem(ash::ShelfID id) override; 28 void CloseLauncherItem(ash::ShelfID id) override;
26 bool IsPinned(ash::ShelfID id) override; 29 bool IsPinned(ash::ShelfID id) override;
27 void SetV1AppStatus(const std::string& app_id, 30 void SetV1AppStatus(const std::string& app_id,
28 ash::ShelfItemStatus status) override; 31 ash::ShelfItemStatus status) override;
29 void Launch(ash::ShelfID id, int event_flags) override; 32 void Launch(ash::ShelfID id, int event_flags) override;
30 void Close(ash::ShelfID id) override; 33 void Close(ash::ShelfID id) override;
31 bool IsOpen(ash::ShelfID id) override; 34 bool IsOpen(ash::ShelfID id) override;
32 bool IsPlatformApp(ash::ShelfID id) override; 35 bool IsPlatformApp(ash::ShelfID id) override;
33 void ActivateApp(const std::string& app_id, 36 void ActivateApp(const std::string& app_id,
34 ash::ShelfLaunchSource source, 37 ash::ShelfLaunchSource source,
(...skipping 17 matching lines...) Expand all
52 void ActivateShellApp(const std::string& app_id, int window_index) override; 55 void ActivateShellApp(const std::string& app_id, int window_index) override;
53 bool IsWebContentHandledByApplication(content::WebContents* web_contents, 56 bool IsWebContentHandledByApplication(content::WebContents* web_contents,
54 const std::string& app_id) override; 57 const std::string& app_id) override;
55 bool ContentCanBeHandledByGmailApp( 58 bool ContentCanBeHandledByGmailApp(
56 content::WebContents* web_contents) override; 59 content::WebContents* web_contents) override;
57 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override; 60 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
58 base::string16 GetAppListTitle( 61 base::string16 GetAppListTitle(
59 content::WebContents* web_contents) const override; 62 content::WebContents* web_contents) const override;
60 BrowserShortcutLauncherItemController* 63 BrowserShortcutLauncherItemController*
61 GetBrowserShortcutLauncherItemController() override; 64 GetBrowserShortcutLauncherItemController() override;
65 ash::ShelfItemDelegate* GetShelfItemDelegate(const ash::ShelfID id) override;
62 bool ShelfBoundsChangesProbablyWithUser( 66 bool ShelfBoundsChangesProbablyWithUser(
63 ash::WmShelf* shelf, 67 ash::WmShelf* shelf,
64 const AccountId& account_id) const override; 68 const AccountId& account_id) const override;
65 void OnUserProfileReadyToSwitch(Profile* profile) override; 69 void OnUserProfileReadyToSwitch(Profile* profile) override;
66 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; 70 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
67 const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override; 71 const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override;
68 72
69 // AppIconLoaderDelegate: 73 // AppIconLoaderDelegate:
70 void OnAppImageUpdated(const std::string& app_id, 74 void OnAppImageUpdated(const std::string& app_id,
71 const gfx::ImageSkia& image) override; 75 const gfx::ImageSkia& image) override;
72 76
73 protected: 77 protected:
74 // ChromeLauncherController: 78 // ChromeLauncherController:
75 void OnInit() override; 79 void OnInit() override;
76 80
77 private: 81 private:
78 // Pin the items set in the current profile's preferences. 82 // Pin the items set in the current profile's preferences.
79 void PinAppsFromPrefs(); 83 void PinAppsFromPrefs();
80 84
81 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 85 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
82 }; 86 };
83 87
84 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 88 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698