ash/shelf/shelf_view.cc - Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf

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 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly

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

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

index 0fb0c0c43eb550a0a272525503e24ea9fc0e1f31..f2bf74f0be601364d8a1a4a3925c5ff54c02601b 100644

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

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

@@ -11,6 +11,8 @@

#include "ash/ash_switches.h"

#include "ash/aura/wm_window_aura.h"

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

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

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

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

#include "ash/drag_drop/drag_image_view.h"

#include "ash/metrics/user_metrics_recorder.h"

@@ -23,9 +25,7 @@

#include "ash/shelf/shelf_button.h"

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_icon_observer.h"

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

#include "ash/shelf/shelf_menu_model.h"

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

#include "ash/shelf/shelf_widget.h"

#include "ash/shell.h"

#include "ash/shell_delegate.h"

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