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

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

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)
Patch Set: Fix test. Created 3 years, 11 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 16 matching lines...) Expand all
27 const ash::ShelfItem* GetItem(ash::ShelfID id) const override; 27 const ash::ShelfItem* GetItem(ash::ShelfID id) const override;
28 void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override; 28 void SetItemType(ash::ShelfID id, ash::ShelfItemType type) override;
29 void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override; 29 void SetItemStatus(ash::ShelfID id, ash::ShelfItemStatus status) override;
30 void SetItemController(ash::ShelfID id, 30 void SetItemController(ash::ShelfID id,
31 LauncherItemController* controller) override; 31 LauncherItemController* controller) override;
32 void CloseLauncherItem(ash::ShelfID id) override; 32 void CloseLauncherItem(ash::ShelfID id) override;
33 void Pin(ash::ShelfID id) override; 33 void Pin(ash::ShelfID id) override;
34 void Unpin(ash::ShelfID id) override; 34 void Unpin(ash::ShelfID id) override;
35 bool IsPinned(ash::ShelfID id) override; 35 bool IsPinned(ash::ShelfID id) override;
36 void TogglePinned(ash::ShelfID id) override; 36 void TogglePinned(ash::ShelfID id) override;
37 bool IsPinnable(ash::ShelfID id) const override;
38 void LockV1AppWithID(const std::string& app_id) override; 37 void LockV1AppWithID(const std::string& app_id) override;
39 void UnlockV1AppWithID(const std::string& app_id) override; 38 void UnlockV1AppWithID(const std::string& app_id) override;
40 void Launch(ash::ShelfID id, int event_flags) override; 39 void Launch(ash::ShelfID id, int event_flags) override;
41 void Close(ash::ShelfID id) override; 40 void Close(ash::ShelfID id) override;
42 bool IsOpen(ash::ShelfID id) override; 41 bool IsOpen(ash::ShelfID id) override;
43 bool IsPlatformApp(ash::ShelfID id) override; 42 bool IsPlatformApp(ash::ShelfID id) override;
44 void ActivateApp(const std::string& app_id, 43 void ActivateApp(const std::string& app_id,
45 ash::LaunchSource source, 44 ash::LaunchSource source,
46 int event_flags) override; 45 int event_flags) override;
47 void SetLauncherItemImage(ash::ShelfID shelf_id, 46 void SetLauncherItemImage(ash::ShelfID shelf_id,
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // Pin the items set in the current profile's preferences. 86 // Pin the items set in the current profile's preferences.
88 void PinAppsFromPrefs(); 87 void PinAppsFromPrefs();
89 88
90 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>> 89 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>
91 app_id_to_item_delegate_; 90 app_id_to_item_delegate_;
92 91
93 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 92 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
94 }; 93 };
95 94
96 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 95 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698