Update shelf spacing in Chrome OS according to the MD specs

chrome/browser/ui/apps/chrome_app_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 
 #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"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_utils.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ skipping 255 matching lines @@
     const GURL& security_origin,
     content::MediaStreamType type,
     const extensions::Extension* extension) {
   return MediaCaptureDevicesDispatcher::GetInstance()
       ->CheckMediaAccessPermission(
           web_contents, security_origin, type, extension);
 }
 
 int ChromeAppDelegate::PreferredIconSize() {
 #if defined(USE_ASH)
-  return ash::kShelfSize;
+  return ash::GetShelfLayoutConstant(ash::SHELF_SIZE);
 #else
   return extension_misc::EXTENSION_ICON_SMALL;
 #endif
 }
 
 void ChromeAppDelegate::SetWebContentsBlocked(
     content::WebContents* web_contents,
     bool blocked) {
   if (!blocked)
     web_contents->Focus();
@@ skipping 42 matching lines @@
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_APP_TERMINATING:
       if (!terminating_callback_.is_null())
         terminating_callback_.Run();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }