ash/common/wm/panels/panel_layout_manager.h - Issue 2620153003: Folds WmRootWindowController into RootWindowController

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/common/wm/panels/panel_layout_manager.h

Issue 2620153003: Folds WmRootWindowController into RootWindowController (Closed)

Patch Set: merge Created 3 years, 11 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/common/wm/panels/panel_layout_manager.h

diff --git a/ash/common/wm/panels/panel_layout_manager.h b/ash/common/wm/panels/panel_layout_manager.h

index 9bb17613a5f9e862b25b1d9ca03e08ed2df800ac..db78889cec275cbdfe7070ab556b843e9d5c749d 100644

--- a/ash/common/wm/panels/panel_layout_manager.h

+++ b/ash/common/wm/panels/panel_layout_manager.h

@@ -36,7 +36,7 @@ class PanelCalloutWidget;

class WmShelf;

namespace wm {

-class WmRootWindowController;

+class RootWindowController;

}

// PanelLayoutManager is responsible for organizing panels within the

@@ -170,7 +170,7 @@ class ASH_EXPORT PanelLayoutManager

// Parent window associated with this layout manager.

WmWindow* panel_container_;

- WmRootWindowController* root_window_controller_;

+ RootWindowController* root_window_controller_;

// Protect against recursive calls to OnWindowAddedToLayout().

bool in_add_window_;