Clean up some ash constants.

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 "base/macros.h"
@@ skipping 278 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::GetShelfConstant(ash::SHELF_SIZE);
+  return ash::kShelfSize;
 #else
   return extension_misc::EXTENSION_ICON_SMALL;
 #endif
 }
 
 void ChromeAppDelegate::SetWebContentsBlocked(
     content::WebContents* web_contents,
     bool blocked) {
   if (!blocked)
     web_contents->Focus();
@@ skipping 38 matching lines @@
                                         KeepAliveRestartOption::DISABLED));
 }
 
 void ChromeAppDelegate::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_APP_TERMINATING, type);
   if (!terminating_callback_.is_null())
     terminating_callback_.Run();
 }