chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - 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/ash/launcher/chrome_launcher_controller.h

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/ash/launcher/chrome_launcher_controller.h

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

index fc0eadb3b8ada5f52018a8a1b1ab215b18988192..f49958c976909d2b83cff8a859cf0b666f9f4ca1 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h

@@ -11,13 +11,13 @@

#include <string>

#include <vector>

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

#include "ash/display/window_tree_host_manager.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_item_types.h"

#include "ash/shelf/shelf_model_observer.h"

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

#include "base/compiler_specific.h"

#include "base/macros.h"

#include "base/memory/scoped_vector.h"