ash/shelf/shelf.cc - Issue 2041583004: mash: Move WmShelfAura ownership to RootWindowController and init it earlier

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.cc

Issue 2041583004: mash: Move WmShelfAura ownership to RootWindowController and init it earlier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@moveshelftypes

Patch Set: . 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:

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

Download patch

Index: ash/shelf/shelf.cc

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

index 63bd2a9ac0a1c6fc8e695c3b5502b27d4a18f4dd..f64897a247ed57f0921d09b635bd781d4b89b2c1 100644

--- a/ash/shelf/shelf.cc

+++ b/ash/shelf/shelf.cc

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

#include <algorithm>

#include <cmath>

-#include "ash/aura/wm_shelf_aura.h"

#include "ash/common/shelf/wm_shelf_util.h"

#include "ash/common/shell_window_ids.h"

#include "ash/focus_cycler.h"

@@ -51,9 +50,6 @@ Shelf::Shelf(ShelfModel* shelf_model,

shelf_view_->Init();

shelf_widget_->GetContentsView()->AddChildView(shelf_view_);

shelf_widget_->GetNativeView()->SetName(kNativeViewName);

- // This has to be done after the ShelfWidget and ShelfLayoutManager have

- // been created.

- wm_shelf_.reset(new WmShelfAura(this));

}

Shelf::~Shelf() {

« no previous file with comments | « ash/shelf/shelf.h ('k') | ash/shelf/shelf_widget.h » ('j') | no next file with comments »