ash/shelf/shelf_layout_manager.h - Issue 2871813002: Converts remaining usage of WmLayoutManager to aura::LayoutManager

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/shelf/shelf_layout_manager.h

Issue 2871813002: Converts remaining usage of WmLayoutManager to aura::LayoutManager (Closed)

Patch Set: cleanup Created 3 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/shelf/shelf_layout_manager.h

diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h

index 1f56cb73796d2fe9c2922d7cd3563b979fb5350b..5a88d01965910d9dd833a5b60fa89b34def4b363 100644

--- a/ash/shelf/shelf_layout_manager.h

+++ b/ash/shelf/shelf_layout_manager.h

@@ -129,14 +129,14 @@ class ASH_EXPORT ShelfLayoutManager

// Overridden from wm::WmSnapToPixelLayoutManager:

void OnWindowResized() override;

- void SetChildBounds(WmWindow* child,

+ void SetChildBounds(aura::Window* child,

const gfx::Rect& requested_bounds) override;

// Overridden from ShellObserver:

void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override;

void OnPinnedStateChanged(WmWindow* pinned_window) override;

void OnVirtualKeyboardStateChanged(bool activated,

- WmWindow* root_window) override;

+ aura::Window* root_window) override;

// Overridden from aura::client::ActivationChangeObserver:

void OnWindowActivated(ActivationReason reason,

« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »