chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h - Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf*

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_impl.h

Issue 2279533002: ash: Convert ShelfDelegate to use WmShelf* instead of Shelf* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « ash/test/test_shelf_delegate.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d3007c6c4b2bedf325f07f07aeb14e13206a9931..dbffd9e264e27b7ef31d8dbb27b5fd291d0ca682 100644

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

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

@@ -149,12 +149,12 @@ class ChromeLauncherControllerImpl

}

// ash::ShelfDelegate:

- void OnShelfCreated(ash::Shelf* shelf) override;

- void OnShelfDestroyed(ash::Shelf* shelf) override;

- void OnShelfAlignmentChanged(ash::Shelf* shelf) override;

- void OnShelfAutoHideBehaviorChanged(ash::Shelf* shelf) override;

- void OnShelfAutoHideStateChanged(ash::Shelf* shelf) override;

- void OnShelfVisibilityStateChanged(ash::Shelf* shelf) override;

+ void OnShelfCreated(ash::WmShelf* shelf) override;

+ void OnShelfDestroyed(ash::WmShelf* shelf) override;

+ void OnShelfAlignmentChanged(ash::WmShelf* shelf) override;

+ void OnShelfAutoHideBehaviorChanged(ash::WmShelf* shelf) override;

+ void OnShelfAutoHideStateChanged(ash::WmShelf* shelf) override;

+ void OnShelfVisibilityStateChanged(ash::WmShelf* shelf) override;

ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;

bool HasShelfIDToAppIDMapping(ash::ShelfID id) const override;

const std::string& GetAppIDForShelfID(ash::ShelfID id) override;