| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/tray/tray_constants.h" | 5 #include "ash/common/system/tray/tray_constants.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | |
| 8 #include "third_party/skia/include/core/SkColor.h" | 7 #include "third_party/skia/include/core/SkColor.h" |
| 9 | 8 |
| 10 namespace ash { | 9 namespace ash { |
| 11 | 10 |
| 12 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7; | 11 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7; |
| 13 const int kPaddingFromBottomOfScreenBottomAlignment = 7; | 12 const int kPaddingFromBottomOfScreenBottomAlignment = 7; |
| 14 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8; | 13 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8; |
| 15 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9; | 14 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9; |
| 16 const int kPaddingFromBottomOfScreenVerticalAlignment = 10; | 15 const int kPaddingFromBottomOfScreenVerticalAlignment = 10; |
| 17 | 16 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 (kNotificationIconWidth + kNotificationButtonWidth + | 77 (kNotificationIconWidth + kNotificationButtonWidth + |
| 79 (kTrayPopupPaddingHorizontal / 2) * 3); | 78 (kTrayPopupPaddingHorizontal / 2) * 3); |
| 80 | 79 |
| 81 const int kTrayAvatarCornerRadius = 2; | 80 const int kTrayAvatarCornerRadius = 2; |
| 82 const int kTrayAvatarSize = 32; | 81 const int kTrayAvatarSize = 32; |
| 83 | 82 |
| 84 const int kTraySpacing = 4; | 83 const int kTraySpacing = 4; |
| 85 const int kShelfItemHeight = 38; | 84 const int kShelfItemHeight = 38; |
| 86 | 85 |
| 87 } // namespace ash | 86 } // namespace ash |
| OLD | NEW |