Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / tray_constants.h

diff --git a/src/ash/system/tray/tray_constants.h b/src/ash/system/tray/tray_constants.h
index 82c8f5f..b55d8fe 100644 (file)
--- a/src/ash/system/tray/tray_constants.h
+++ b/src/ash/system/tray/tray_constants.h
@@ -17,10 +17,10 @@ extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
 extern const int kPaddingFromBottomOfScreenVerticalAlignment;
 
-extern const int kAlternateLayoutBubblePaddingHorizontalBottom;
-extern const int kAlternateLayoutBubblePaddingHorizontalSide;
-extern const int kAlternateLayoutBubblePaddingVerticalBottom;
-extern const int kAlternateLayoutBubblePaddingVerticalSide;
+extern const int kBubblePaddingHorizontalBottom;
+extern const int kBubblePaddingHorizontalSide;
+extern const int kBubblePaddingVerticalBottom;
+extern const int kBubblePaddingVerticalSide;
 
 extern const int kPaddingFromEdgeOfShelf;
 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
@@ -42,6 +42,7 @@ extern const int kTrayPopupAutoCloseDelayForTextInSeconds;
 extern const int kTrayPopupPaddingHorizontal;
 extern const int kTrayPopupPaddingBetweenItems;
 extern const int kTrayPopupTextSpacingVertical;
+extern const int kTrayPopupUserCardVerticalPadding;
 
 extern const int kTrayPopupItemHeight;
 extern const int kTrayPopupDetailsIconWidth;
@@ -71,13 +72,17 @@ extern const int kNotificationIconWidth;
 extern const int kNotificationButtonWidth;
 extern const int kTrayNotificationContentsWidth;
 
-// Returns kTraySpacing or kAlternateTraySpacing as applicable
-// (Determined by ash::switches::UseAlternateShelfLayout).
-int GetTraySpacing();
 
-// Returns kShelfItemHeight or kAlternateShelfItemHeight as applicable
-// (Determined by ash::switches::UseAlternateShelfLayout).
-int GetShelfItemHeight();
+extern const int kTrayAvatarCornerRadius;
+extern const int kTrayAvatarSize;
+
+extern const int kTraySpacing;
+extern const int kShelfItemHeight;
+
+namespace test {
+const int kSettingsTrayItemViewId = 10000;
+const int kAccessibilityTrayItemViewId = 10001;
+}  // namespace test
 
 }  // namespace ash