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

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

Issue 2341643002: Enhance chrome.app.window API for shelf integration with pinning support (cont.) (Closed)
Patch Set: Unit Test Fix Created 4 years, 1 month 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 content::WebContents* web_contents) const override; 72 content::WebContents* web_contents) const override;
73 BrowserShortcutLauncherItemController* 73 BrowserShortcutLauncherItemController*
74 GetBrowserShortcutLauncherItemController() override; 74 GetBrowserShortcutLauncherItemController() override;
75 LauncherItemController* GetLauncherItemController( 75 LauncherItemController* GetLauncherItemController(
76 const ash::ShelfID id) override; 76 const ash::ShelfID id) override;
77 bool ShelfBoundsChangesProbablyWithUser( 77 bool ShelfBoundsChangesProbablyWithUser(
78 ash::WmShelf* shelf, 78 ash::WmShelf* shelf,
79 const AccountId& account_id) const override; 79 const AccountId& account_id) const override;
80 void OnUserProfileReadyToSwitch(Profile* profile) override; 80 void OnUserProfileReadyToSwitch(Profile* profile) override;
81 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; 81 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
82 const std::string& GetLaunchIDForShelfID(ash::ShelfID id) override;
82 83
83 // AppIconLoaderDelegate: 84 // AppIconLoaderDelegate:
84 void OnAppImageUpdated(const std::string& app_id, 85 void OnAppImageUpdated(const std::string& app_id,
85 const gfx::ImageSkia& image) override; 86 const gfx::ImageSkia& image) override;
86 87
87 private: 88 private:
88 // Pin the items set in the current profile's preferences. 89 // Pin the items set in the current profile's preferences.
89 void PinAppsFromPrefs(); 90 void PinAppsFromPrefs();
90 91
91 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>> 92 std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>
92 app_id_to_item_delegate_; 93 app_id_to_item_delegate_;
93 94
94 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 95 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
95 }; 96 };
96 97
97 #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