Consolidate some more ash tray constants.

ash/common/system/tray/system_tray_bubble.cc

 // Copyright (c) 2012 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 "ash/common/system/tray/system_tray_bubble.h"
 
 #include <utility>
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
@@ skipping 20 matching lines @@
 namespace ash {
 
 namespace {
 
 // Normally a detailed view is the same size as the default view. However,
 // when showing a detailed view directly (e.g. clicking on a notification),
 // we may not know the height of the default view, or the default view may
 // be too short, so we use this as a default and minimum height for any
 // detailed view.
 int GetDetailedBubbleMaxHeight() {
-  return GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT) * 5;
+  return kTrayPopupItemMinHeight * 5;
 }
 
 // Duration of swipe animation used when transitioning from a default to
 // detailed view or vice versa.
 const int kSwipeDelayMS = 150;
 
 // Extra bottom padding when showing the BUBBLE_TYPE_DEFAULT view.
 const int kDefaultViewBottomPadding = 4;
 
 // Implicit animation observer that deletes itself and the layer at the end of
@@ skipping 317 matching lines @@
     }
   }
 
   if (focus_view) {
     tray_->ActivateBubble();
     focus_view->RequestFocus();
   }
 }
 
 }  // namespace ash