Apply View::set_preferred_size in some more places.

ash/system/tray/tray_constants.h

 // 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.
 
 #ifndef ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_
 #define ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_
 
 #include "ash/ash_export.h"
 
 typedef unsigned int SkColor;
@@ skipping 15 matching lines @@
 // items like labels and buttons.
 extern const int kTrayTextFontSizeIncrease;
 
 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
 
 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment;
 
 ASH_EXPORT extern const int kTrayItemSize;
 
 // Extra padding used beside a single icon in the tray area of the shelf.
-extern const int kTrayImageItemPadding;
+constexpr int kTrayImageItemPadding = 3;
 
 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment;
 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment;
 
 extern const int kTrayMenuBottomRowPadding;
 extern const int kTrayMenuBottomRowPaddingBetweenItems;
 
 // The minimum width of the tray menu.
 extern const int kTrayMenuMinimumWidth;
 
@@ skipping 52 matching lines @@
 // The color of the separators used in the system menu.
 extern const SkColor kMenuSeparatorColor;
 
 // The size and foreground color of the icons appearing in the material design
 // system tray.
 extern const int kTrayIconSize;
 extern const SkColor kTrayIconColor;
 
 // The total visual padding at the start and end of the icon/label section
 // of the tray.
-extern const int kTrayEdgePadding;
+constexpr int kTrayEdgePadding = 6;
 
 // The size and foreground color of the icons appearing in the material design
 // system menu.
 extern const int kMenuIconSize;
 extern const SkColor kMenuIconColor;
 extern const SkColor kMenuIconColorDisabled;
 // The size of buttons in the system menu.
 ASH_EXPORT extern const int kMenuButtonSize;
 // The vertical padding for the system menu separator.
 extern const int kMenuSeparatorVerticalPadding;
@@ skipping 23 matching lines @@
 extern const int kTrayPopupSystemInfoRowHeight;
 
 namespace test {
 const int kSettingsTrayItemViewId = 10000;
 const int kAccessibilityTrayItemViewId = 10001;
 }  // namespace test
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_