ash/mus/bridge/wm_root_window_controller_mus.h - Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/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: ash/mus/bridge/wm_root_window_controller_mus.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp Created 4 years, 6 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/mus/bridge/wm_root_window_controller_mus.h

diff --git a/ash/mus/bridge/wm_root_window_controller_mus.h b/ash/mus/bridge/wm_root_window_controller_mus.h

index a9da712d79ed023a273f06a3ec9188d09e1da9b5..3bfe8db6781f4cf87a094071e1a068dd821d982f 100644

--- a/ash/mus/bridge/wm_root_window_controller_mus.h

+++ b/ash/mus/bridge/wm_root_window_controller_mus.h

@@ -56,7 +56,7 @@ class WmRootWindowControllerMus : public wm::WmRootWindowController {

wm::WmGlobals* GetGlobals() override;

wm::WorkspaceWindowState GetWorkspaceWindowState() override;

AlwaysOnTopController* GetAlwaysOnTopController() override;

- wm::WmShelf* GetShelf() override;

+ WmShelf* GetShelf() override;

wm::WmWindow* GetWindow() override;

void ConfigureWidgetInitParamsForContainer(

views::Widget* widget,