| 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 #include "ui/views/layout/fill_layout.h" | 63 #include "ui/views/layout/fill_layout.h" |
| 64 #include "ui/views/mouse_watcher.h" | 64 #include "ui/views/mouse_watcher.h" |
| 65 #include "ui/views/painter.h" | 65 #include "ui/views/painter.h" |
| 66 #include "ui/views/view.h" | 66 #include "ui/views/view.h" |
| 67 #include "ui/views/widget/widget.h" | 67 #include "ui/views/widget/widget.h" |
| 68 | 68 |
| 69 namespace { | 69 namespace { |
| 70 | 70 |
| 71 const int kUserDetailsVerticalPadding = 5; | 71 const int kUserDetailsVerticalPadding = 5; |
| 72 const int kUserCardVerticalPadding = 10; | 72 const int kUserCardVerticalPadding = 10; |
| 73 const int kInactiveUserCardVerticalPadding = 4; | |
| 74 const int kProfileRoundedCornerRadius = 2; | 73 const int kProfileRoundedCornerRadius = 2; |
| 75 const int kUserIconSize = 27; | 74 const int kUserIconSize = 27; |
| 76 const int kUserIconLargeSize = 32; | 75 const int kUserIconLargeSize = 32; |
| 77 const int kUserIconLargeCornerRadius = 2; | 76 const int kUserIconLargeCornerRadius = 2; |
| 78 const int kUserLabelToIconPadding = 5; | 77 const int kUserLabelToIconPadding = 5; |
| 79 // When using multi login, this spacing is added between user icons. | 78 // When using multi login, this spacing is added between user icons. |
| 80 const int kTrayLabelSpacing = 1; | 79 const int kTrayLabelSpacing = 1; |
| 81 | 80 |
| 82 // When a hover border is used, it is starting this many pixels before the icon | 81 // When a hover border is used, it is starting this many pixels before the icon |
| 83 // position. | 82 // position. |
| (...skipping 1327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1411 internal::GetRootWindowController( | 1410 internal::GetRootWindowController( |
| 1412 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); | 1411 system_tray()->GetWidget()->GetNativeWindow()->GetRootWindow()); |
| 1413 if (controller && controller->shelf()) { | 1412 if (controller && controller->shelf()) { |
| 1414 UpdateAfterShelfAlignmentChange( | 1413 UpdateAfterShelfAlignmentChange( |
| 1415 controller->GetShelfLayoutManager()->GetAlignment()); | 1414 controller->GetShelfLayoutManager()->GetAlignment()); |
| 1416 } | 1415 } |
| 1417 } | 1416 } |
| 1418 | 1417 |
| 1419 } // namespace internal | 1418 } // namespace internal |
| 1420 } // namespace ash | 1419 } // namespace ash |
| OLD | NEW |