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

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

index f64897a247ed57f0921d09b635bd781d4b89b2c1..e6ca53ea4bfb7c074c2c712f262f1affa36cfff6 100644

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

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

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

#include <algorithm>

#include <cmath>

+#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/wm_shelf_util.h"

#include "ash/common/shell_window_ids.h"

#include "ash/focus_cycler.h"

@@ -14,10 +17,7 @@

#include "ash/root_window_settings.h"

#include "ash/screen_util.h"

#include "ash/shelf/shelf_delegate.h"

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

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

#include "ash/shelf/shelf_layout_manager.h"

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

#include "ash/shelf/shelf_navigator.h"

#include "ash/shelf/shelf_util.h"

#include "ash/shell.h"

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