ash/root_window_controller.cc - Issue 1918883002: Makes Panel related classes use ash/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/root_window_controller.cc

Issue 1918883002: Makes Panel related classes use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@phantom_window_controller

Patch Set: feedback Created 4 years, 8 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/root_window_controller.cc

diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc

index 2b6a6213d78e39836a585ece87089bae03235015..2c1f7f061b3a56b153a3216baed61f3b9070e4d0 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -822,8 +822,9 @@ void RootWindowController::InitLayoutManagers() {

// Create Panel layout manager

aura::Window* panel_container = GetContainer(kShellWindowId_PanelContainer);

- panel_layout_manager_ = new PanelLayoutManager(panel_container);

- panel_container->SetLayoutManager(panel_layout_manager_);

+ wm::WmWindow* wm_panel_container = wm::WmWindowAura::Get(panel_container);

+ panel_layout_manager_ = new PanelLayoutManager(wm_panel_container);

+ wm_panel_container->SetLayoutManager(base::WrapUnique(panel_layout_manager_));

panel_container_handler_.reset(new PanelWindowEventHandler);

panel_container->AddPreTargetHandler(panel_container_handler_.get());

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