ash/shelf/shelf_view.cc - Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell

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

Issue 2177663002: mash: Move ownership of ShelfDelegate to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix wallpaper tests again Created 4 years, 5 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/shelf/shelf_view.cc

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

index 19fecf86a9be56cda79caf109c61fec04eb3f8a2..7ca66f899f82331e54b2a0a6019718f54886a4f1 100644

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

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

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

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

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

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

+#include "ash/common/shelf/shelf_delegate.h"

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

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

#include "ash/common/shell_delegate.h"

@@ -24,7 +25,6 @@

#include "ash/scoped_target_root_window.h"

#include "ash/shelf/shelf.h"

#include "ash/shelf/shelf_button.h"

-#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_icon_observer.h"

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

@@ -390,6 +390,7 @@ ShelfView::ShelfView(ShelfModel* model,

is_repost_event_on_same_item_(false),

last_pressed_index_(-1) {

DCHECK(model_);

+ DCHECK(delegate_);

DCHECK(wm_shelf_);

bounds_animator_.reset(new views::BoundsAnimator(this));

bounds_animator_->AddObserver(this);

« no previous file with comments | « ash/shelf/shelf_layout_manager.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »