chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h - Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 4 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:

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

index 4e4b3683d0b670ba5df5189d78755bd59652750b..420c1cc8d977bcc09c4c0a758afc9145d7a9990a 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h

@@ -80,7 +80,7 @@ class ChromeLauncherControllerMus : public ChromeLauncherController {

LauncherItemController* GetLauncherItemController(

const ash::ShelfID id) override;

bool ShelfBoundsChangesProbablyWithUser(

- ash::Shelf* shelf,

+ ash::WmShelf* shelf,

const AccountId& account_id) const override;

void OnUserProfileReadyToSwitch(Profile* profile) override;

ArcAppDeferredLauncherController* GetArcDeferredLauncher() override;