chrome/browser/ui/apps/chrome_app_delegate.cc - Issue 2036353002: mash: Move ash/common/wm/shelf 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: chrome/browser/ui/apps/chrome_app_delegate.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase again 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:

Index: chrome/browser/ui/apps/chrome_app_delegate.cc

diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc

index 36be90d72f8194002e9eb796de2612129ee8a402..2dd00c721ce91ff5a3d93ff328b5d1f132cf6ac1 100644

--- a/chrome/browser/ui/apps/chrome_app_delegate.cc

+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc

@@ -39,7 +39,7 @@

#include "extensions/common/constants.h"

#if defined(USE_ASH)

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

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

#endif

#if defined(ENABLE_PRINTING)