chrome/browser/ui/apps/chrome_app_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_app_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: ... Created 6 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/apps/chrome_app_window_delegate.cc

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

index 6bccd2f38f0e4b76421e1879888a7d0b653e3bb3..dd7e546a42aaf5de2f55e91ba89a095ff8e3abc8 100644

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

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

@@ -201,7 +201,7 @@ void ChromeAppWindowDelegate::RequestMediaAccessPermission(

int ChromeAppWindowDelegate::PreferredIconSize() {

#if defined(USE_ASH)

- return ash::kShelfPreferredSize;

+ return ash::kShelfSize;

#else

return extension_misc::EXTENSION_ICON_SMALL;

#endif