ash/root_window_controller.cc - Issue 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common

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 1914093002: Refactors DockedWindowLayoutManager in terms of ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nuke_aura_window

Patch Set: merge 2 trunk 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 c377b655d711afb845406639724fb18dbd0f5e1f..69d95d2b53f352b7f0871c93926ee5ad4ba421b6 100644

--- a/ash/root_window_controller.cc

+++ b/ash/root_window_controller.cc

@@ -34,6 +34,7 @@

#include "ash/touch/touch_observer_hud.h"

#include "ash/wm/always_on_top_controller.h"

#include "ash/wm/aura/aura_layout_manager_adapter.h"

+#include "ash/wm/aura/wm_shelf_aura.h"

#include "ash/wm/aura/wm_window_aura.h"

#include "ash/wm/common/workspace/workspace_layout_manager_delegate.h"

#include "ash/wm/dock/docked_window_layout_manager.h"

@@ -443,7 +444,7 @@ void RootWindowController::OnShelfCreated() {

if (panel_layout_manager_)

panel_layout_manager_->SetShelf(shelf_->shelf());

if (docked_layout_manager_) {

- docked_layout_manager_->SetShelf(shelf_->shelf());

+ docked_layout_manager_->SetShelf(shelf_->shelf()->wm_shelf());

if (shelf_->shelf_layout_manager())

docked_layout_manager_->AddObserver(shelf_->shelf_layout_manager());

}

« no previous file with comments | « ash/mus/shelf_delegate_mus.cc ('k') | ash/shelf/app_list_button.cc » ('j') | ash/shelf/shelf.cc » ('J')