chrome/browser/ui/apps/chrome_shell_window_delegate.cc - Issue 97983003: Start the move of launcher_types.h to 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_shell_window_delegate.cc

Issue 97983003: Start the move of launcher_types.h to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: the rename Created 7 years 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_shell_window_delegate.cc

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

index f30e5018313dfb62871040ab14a6d24391c3dd71..957be818492419878fc69d8a9f5c78a3fe5f1fac 100644

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

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

@@ -20,7 +20,7 @@

#include "content/public/browser/web_contents_view.h"

#if defined(USE_ASH)

-#include "ash/launcher/launcher_types.h"

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

#endif

#if defined(ENABLE_PRINTING)

@@ -145,7 +145,7 @@ void ChromeShellWindowDelegate::RequestMediaAccessPermission(

int ChromeShellWindowDelegate::PreferredIconSize() {

#if defined(USE_ASH)

- return ash::kLauncherPreferredSize;

+ return ash::kShelfPreferredSize;

#else

return extension_misc::EXTENSION_ICON_SMALL;

#endif