ash/aura/wm_shelf_aura.cc - Issue 2187953002: mash: Migrate ShelfButton* to wm common types

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: ash/aura/wm_shelf_aura.cc

Issue 2187953002: mash: Migrate ShelfButton* to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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: ash/aura/wm_shelf_aura.cc

diff --git a/ash/aura/wm_shelf_aura.cc b/ash/aura/wm_shelf_aura.cc

index 50f6389a58b506bacc8971bf13aafcf9015d75be..36adc0ea8165c7a002a111654964e9e4fcbd9795 100644

--- a/ash/aura/wm_shelf_aura.cc

+++ b/ash/aura/wm_shelf_aura.cc

@@ -167,6 +167,10 @@ ShelfLockingManager* WmShelfAura::GetShelfLockingManagerForTesting() {

return shelf_->shelf_locking_manager_for_testing();

}

+ShelfView* WmShelfAura::GetShelfViewForTesting() {

+ return shelf_->shelf_view_for_testing();

void WmShelfAura::WillDeleteShelfLayoutManager() {

ResetShelfLayoutManager();

}