chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.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_per_app.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:

View side-by-side diff with in-line comments

Download patch

« ash/shelf/shelf_layout_manager.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.h ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_browser.h » ('j') | ui/compositor/layer_animation_element.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_per_app.h

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

index 1022a25af7b0ae2c25b37f058c067a6924926c13..fd7de25aeff778e4a4b9668daa7864dd723a0ca0 100644

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

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

@@ -12,7 +12,7 @@

#include "ash/launcher/launcher_model_observer.h"

#include "ash/launcher/launcher_types.h"

-#include "ash/shelf_types.h"

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

#include "ash/shell_observer.h"

#include "base/basictypes.h"

#include "base/compiler_specific.h"