chrome/browser/ui/apps/chrome_app_delegate.cc - Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs

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_delegate.cc

Issue 1998933002: Update shelf spacing in Chrome OS according to the MD specs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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/system/web_notification/web_notification_tray.cc ('K') | « ash/test/shelf_view_test_api.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/apps/chrome_app_delegate.cc

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

index 46cd38bc3c521e0f936940036db74110a180378f..2897a07677b7ec12453448016273a244b36d6dfe 100644

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

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

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

#include <memory>

#include <utility>

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

#include "base/macros.h"

#include "base/strings/stringprintf.h"

#include "chrome/browser/app_mode/app_mode_utils.h"

@@ -282,7 +283,7 @@ bool ChromeAppDelegate::CheckMediaAccessPermission(

int ChromeAppDelegate::PreferredIconSize() {

#if defined(USE_ASH)

- return ash::kShelfSize;

+ return ash::GetShelfLayoutConstant(ash::SHELF_SIZE);

#else

return extension_misc::EXTENSION_ICON_SMALL;

#endif