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

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

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again Created 4 years, 3 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 <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 bool ContentCanBeHandledByGmailApp( 73 bool ContentCanBeHandledByGmailApp(
74 content::WebContents* web_contents) override; 74 content::WebContents* web_contents) override;
75 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override; 75 gfx::Image GetAppListIcon(content::WebContents* web_contents) const override;
76 base::string16 GetAppListTitle( 76 base::string16 GetAppListTitle(
77 content::WebContents* web_contents) const override; 77 content::WebContents* web_contents) const override;
78 BrowserShortcutLauncherItemController* 78 BrowserShortcutLauncherItemController*
79 GetBrowserShortcutLauncherItemController() override; 79 GetBrowserShortcutLauncherItemController() override;
80 LauncherItemController* GetLauncherItemController( 80 LauncherItemController* GetLauncherItemController(
81 const ash::ShelfID id) override; 81 const ash::ShelfID id) override;
82 bool ShelfBoundsChangesProbablyWithUser( 82 bool ShelfBoundsChangesProbablyWithUser(
83 ash::Shelf* shelf, 83 ash::WmShelf* shelf,
84 const AccountId& account_id) const override; 84 const AccountId& account_id) const override;
85 void OnUserProfileReadyToSwitch(Profile* profile) override; 85 void OnUserProfileReadyToSwitch(Profile* profile) override;
86 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override; 86 ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;
87 87
88 private: 88 private:
89 ChromeLauncherControllerMus(); 89 ChromeLauncherControllerMus();
90 90
91 std::unique_ptr<ChromeMashShelfController> shelf_controller_; 91 std::unique_ptr<ChromeMashShelfController> shelf_controller_;
92 92
93 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus); 93 DISALLOW_COPY_AND_ASSIGN(ChromeLauncherControllerMus);
94 }; 94 };
95 95
96 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_ 96 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_CHROME_LAUNCHER_CONTROLLER_MUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698