| 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 #ifndef ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 | 9 |
| 10 typedef unsigned int SkColor; | 10 typedef unsigned int SkColor; |
| 11 | 11 |
| 12 namespace ash { | 12 namespace ash { |
| 13 | 13 |
| 14 extern const int kPaddingFromRightEdgeOfScreenBottomAlignment; | 14 extern const int kPaddingFromRightEdgeOfScreenBottomAlignment; |
| 15 extern const int kPaddingFromBottomOfScreenBottomAlignment; | 15 extern const int kPaddingFromBottomOfScreenBottomAlignment; |
| 16 extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment; | 16 extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment; |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 extern const int kTraySpacing; | 79 extern const int kTraySpacing; |
| 80 extern const int kShelfItemHeight; | 80 extern const int kShelfItemHeight; |
| 81 | 81 |
| 82 namespace test { | 82 namespace test { |
| 83 const int kSettingsTrayItemViewId = 10000; | 83 const int kSettingsTrayItemViewId = 10000; |
| 84 const int kAccessibilityTrayItemViewId = 10001; | 84 const int kAccessibilityTrayItemViewId = 10001; |
| 85 } // namespace test | 85 } // namespace test |
| 86 | 86 |
| 87 } // namespace ash | 87 } // namespace ash |
| 88 | 88 |
| 89 #endif // ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_ | 89 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_CONSTANTS_H_ |
| OLD | NEW |