Adds emoji/handwriting/vocie buttons on opt-in IME menu.

ash/common/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_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_
 
 #include "ash/ash_export.h"
 
 typedef unsigned int SkColor;
@@ skipping 10 matching lines @@
 extern const int kBubblePaddingHorizontalSide;
 extern const int kBubblePaddingVerticalBottom;
 extern const int kBubblePaddingVerticalSide;
 
 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
 
 extern const int kTrayImageItemHorizontalPaddingBottomAlignment;
 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment;
 extern const int kTrayImageItemVerticalPaddingVerticalAlignment;
 
-extern const int kTrayImeIconSize;
-extern const int kTrayImeBottomRowPadding;
-extern const int kTrayImeBottomRowPaddingBetweenItems;
-
 ASH_EXPORT extern const int kTrayItemSize;
 
 extern const int kTrayLabelItemHorizontalPaddingBottomAlignment;
 extern const int kTrayLabelItemVerticalPaddingVerticalAlignment;
 
 extern const int kTrayMenuBottomRowPadding;
 extern const int kTrayMenuBottomRowPaddingBetweenItems;
 
 extern const int kTrayPopupAutoCloseDelayInSeconds;
 extern const int kTrayPopupAutoCloseDelayForTextInSeconds;
@@ skipping 44 matching lines @@
 
 // The size and foreground color of the icons appearing in the material design
 // system tray.
 extern const int kTrayIconSize;
 extern const SkColor kTrayIconColor;
 
 // 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 int kMenuButtonSize;
 
 enum TrayConstant {
   // A legacy height value used in non-MD calculations for applying additional
   // borders on tray items.
   TRAY_ITEM_HEIGHT_LEGACY,
 
   // Padding between items in the status tray area.
   TRAY_SPACING,
 
   // Padding between the edge of shelf and the item in status tray area.
   TRAY_PADDING_FROM_EDGE_OF_SHELF,
 
   // The height of the rows in the system tray menu.
   TRAY_POPUP_ITEM_HEIGHT,
 
   // The width and height of the virtual keyboard button in the status tray
   // area. For non-MD, adjustments are made to the button dimensions based on
   // the shelf orientation, so this constant does not specify the true
   // user-visible button bounds.
   VIRTUAL_KEYBOARD_BUTTON_SIZE,
+
+  // The icon size of opt-in IME menu tray.
+  TRAY_IME_MENU_ICON,
 };
 
 int GetTrayConstant(TrayConstant constant);
 
 namespace test {
 const int kSettingsTrayItemViewId = 10000;
 const int kAccessibilityTrayItemViewId = 10001;
 }  // namespace test
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_