chrome/browser/ui/ash/launcher/chrome_launcher_controller.h - Issue 12313118: Refactor: Shelf Widget

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 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: formatting and moved a couple unit tests Created 7 years, 10 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 b0debf67bd44622977c6c77ff87c29620535284d..1bafc78f8e4693b772ed4b63970ab129b97d0d6b 100644

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

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

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

#include "ash/launcher/launcher_delegate.h"

#include "ash/launcher/launcher_types.h"

-#include "ash/shelf_types.h"

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

#include "base/memory/scoped_vector.h"

#include "chrome/browser/extensions/app_icon_loader.h"

#include "chrome/browser/extensions/extension_prefs.h"