ash/common/shelf/shelf_view.cc - Issue 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate.

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/common/shelf/shelf_view.cc

Issue 2791803002: mash: Move LauncherItemController to ash, rename ShelfItemDelegate. (Closed)

Patch Set: Sync and rebase. Created 3 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:

Index: ash/common/shelf/shelf_view.cc

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

index 49669eab6fb15c1c84269b8d7cbb0c75eb7c384f..d99b9e76fdbea9a0df593b57f7a6eec0da50f799 100644

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

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

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

#include "ash/common/wm/root_window_finder.h"

#include "ash/common/wm_shell.h"

#include "ash/common/wm_window.h"

+#include "ash/public/cpp/shelf_item_delegate.h"

#include "ash/shell.h"

#include "ash/strings/grit/ash_strings.h"

#include "base/auto_reset.h"

@@ -1583,7 +1584,7 @@ void ShelfView::ShelfItemMoved(int start_index, int target_index) {

AnimateToIdealBounds();

}

-void ShelfView::OnSetShelfItemDelegate(ShelfID, mojom::ShelfItemDelegate*) {}

+void ShelfView::OnSetShelfItemDelegate(ShelfID, ShelfItemDelegate*) {}

void ShelfView::AfterItemSelected(

const ShelfItem& item,

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