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/user/tray_user.h" | 5 #include "ash/system/user/tray_user.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <climits> | 8 #include <climits> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 | 82 |
83 // When a hover border is used, it is starting this many pixels before the icon | 83 // When a hover border is used, it is starting this many pixels before the icon |
84 // position. | 84 // position. |
85 const int kTrayUserTileHoverBorderInset = 10; | 85 const int kTrayUserTileHoverBorderInset = 10; |
86 | 86 |
87 // The border color of the user button. | 87 // The border color of the user button. |
88 const SkColor kBorderColor = 0xffdcdcdc; | 88 const SkColor kBorderColor = 0xffdcdcdc; |
89 | 89 |
90 // The invisible word joiner character, used as a marker to indicate the start | 90 // The invisible word joiner character, used as a marker to indicate the start |
91 // and end of the user's display name in the public account user card's text. | 91 // and end of the user's display name in the public account user card's text. |
92 const char16 kDisplayNameMark[] = { 0x2060, 0 }; | 92 const base::char16 kDisplayNameMark[] = { 0x2060, 0 }; |
93 | 93 |
94 const int kPublicAccountLogoutButtonBorderImagesNormal[] = { | 94 const int kPublicAccountLogoutButtonBorderImagesNormal[] = { |
95 IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER, | 95 IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER, |
96 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, | 96 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, |
97 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, | 97 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, |
98 IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER, | 98 IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER, |
99 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, | 99 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, |
100 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, | 100 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, |
101 IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER, | 101 IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER, |
102 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, | 102 IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND, |
(...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1418 internal::GetRootWindowController( | 1418 internal::GetRootWindowController( |
1419 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); | 1419 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); |
1420 if (controller && controller->shelf()) { | 1420 if (controller && controller->shelf()) { |
1421 UpdateAfterShelfAlignmentChange( | 1421 UpdateAfterShelfAlignmentChange( |
1422 controller->GetShelfLayoutManager()->GetAlignment()); | 1422 controller->GetShelfLayoutManager()->GetAlignment()); |
1423 } | 1423 } |
1424 } | 1424 } |
1425 | 1425 |
1426 } // namespace internal | 1426 } // namespace internal |
1427 } // namespace ash | 1427 } // namespace ash |
OLD | NEW |