ash/wm/aura/wm_shelf_aura.cc - Issue 1943603002: Makes ash/wm/common a library

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

Issue 1943603002: Makes ash/wm/common a library (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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

index a9048a1bfc6899cb10021c0ad9e45b924500e082..e177f42f098086bcca8421e60ea64c88fa8b5a1d 100644

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

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

@@ -32,7 +32,7 @@ Shelf* WmShelfAura::GetShelf(WmShelf* shelf) {

}

WmWindow* WmShelfAura::GetWindow() {

- return WmWindow::Get(shelf_->shelf_widget());

+ return WmWindowAura::Get(shelf_->shelf_widget()->GetNativeView());

}

ShelfAlignment WmShelfAura::GetAlignment() const {

« no previous file with comments | « ash/wm/aura/wm_root_window_controller_aura.cc ('k') | ash/wm/aura/wm_window_aura.h » ('j') | no next file with comments »