ash/shelf/shelf.cc - Issue 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel

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 2171813004: mash: Fold ShelfItemDelegateManager into ShelfModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

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 282105919cd5ba66d158f0743d327aa7648a008e..2030432fc898a63173f80d4ab1bf874988448582 100644

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

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

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

#include "ash/aura/wm_window_aura.h"

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

-#include "ash/common/shelf/shelf_item_delegate_manager.h"

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

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

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

@@ -139,8 +138,7 @@ void Shelf::ActivateShelfItem(int index) {

const ShelfItem& item = shelf_view_->model()->items()[index];

ShelfItemDelegate* item_delegate =

- Shell::GetInstance()->shelf_item_delegate_manager()->GetShelfItemDelegate(

- item.id);

+ shelf_view_->model()->GetShelfItemDelegate(item.id);

item_delegate->ItemSelected(event);

}

« ash/common/wm_shell.cc ('K') | « ash/common/wm_shell.cc ('k') | ash/shelf/shelf_tooltip_manager_unittest.cc » ('j') | ash/shelf/shelf_view.h » ('J')