chrome/browser/ui/apps/chrome_shell_window_delegate.cc - Issue 140323010: Ash:Shelf - Cleanup of Alternate Shelf (part 1)

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 140323010: Ash:Shelf - Cleanup of Alternate Shelf (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ButtonSize and ButtonSpacing moved to shelf_constants Created 6 years, 11 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_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 957be818492419878fc69d8a9f5c78a3fe5f1fac..9ce422d745926c2d0d420704c4427a6ae7c72d65 100644

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

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

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"

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

#include "base/strings/stringprintf.h"

#include "chrome/browser/favicon/favicon_tab_helper.h"

#include "chrome/browser/file_select_helper.h"

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

int ChromeShellWindowDelegate::PreferredIconSize() {

#if defined(USE_ASH)

- return ash::kShelfPreferredSize;

+ return ash::kShelfSize;

#else

return extension_misc::EXTENSION_ICON_SMALL;

#endif