OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/session/logout_button_tray.h" | 5 #include "ash/system/session/logout_button_tray.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "ash/common/shelf/wm_shelf_util.h" | |
11 #include "ash/common/wm_shell.h" | |
12 #include "ash/public/cpp/shelf_types.h" | 10 #include "ash/public/cpp/shelf_types.h" |
13 #include "ash/resources/grit/ash_resources.h" | 11 #include "ash/resources/grit/ash_resources.h" |
14 #include "ash/resources/vector_icons/vector_icons.h" | 12 #include "ash/resources/vector_icons/vector_icons.h" |
| 13 #include "ash/shelf/wm_shelf_util.h" |
15 #include "ash/system/session/logout_confirmation_controller.h" | 14 #include "ash/system/session/logout_confirmation_controller.h" |
16 #include "ash/system/tray/system_tray_controller.h" | 15 #include "ash/system/tray/system_tray_controller.h" |
17 #include "ash/system/tray/system_tray_notifier.h" | 16 #include "ash/system/tray/system_tray_notifier.h" |
18 #include "ash/system/tray/tray_constants.h" | 17 #include "ash/system/tray/tray_constants.h" |
19 #include "ash/system/tray/tray_utils.h" | 18 #include "ash/system/tray/tray_utils.h" |
20 #include "ash/system/user/login_status.h" | 19 #include "ash/system/user/login_status.h" |
| 20 #include "ash/wm_shell.h" |
21 #include "base/logging.h" | 21 #include "base/logging.h" |
22 #include "third_party/skia/include/core/SkColor.h" | 22 #include "third_party/skia/include/core/SkColor.h" |
23 #include "ui/events/event.h" | 23 #include "ui/events/event.h" |
24 #include "ui/gfx/color_palette.h" | 24 #include "ui/gfx/color_palette.h" |
25 #include "ui/gfx/geometry/insets.h" | 25 #include "ui/gfx/geometry/insets.h" |
26 #include "ui/gfx/geometry/size.h" | 26 #include "ui/gfx/geometry/size.h" |
27 #include "ui/gfx/paint_vector_icon.h" | 27 #include "ui/gfx/paint_vector_icon.h" |
28 #include "ui/views/bubble/tray_bubble_view.h" | 28 #include "ui/views/bubble/tray_bubble_view.h" |
29 #include "ui/views/controls/button/label_button.h" | 29 #include "ui/views/controls/button/label_button.h" |
30 #include "ui/views/controls/button/label_button_border.h" | 30 #include "ui/views/controls/button/label_button_border.h" |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
123 button_->SetText(base::string16()); | 123 button_->SetText(base::string16()); |
124 button_->SetAccessibleName(title); | 124 button_->SetAccessibleName(title); |
125 button_->SetImage(views::LabelButton::STATE_NORMAL, | 125 button_->SetImage(views::LabelButton::STATE_NORMAL, |
126 gfx::CreateVectorIcon(kShelfLogoutIcon, kTrayIconColor)); | 126 gfx::CreateVectorIcon(kShelfLogoutIcon, kTrayIconColor)); |
127 button_->SetMinSize(gfx::Size(kTrayItemSize, kTrayItemSize)); | 127 button_->SetMinSize(gfx::Size(kTrayItemSize, kTrayItemSize)); |
128 } | 128 } |
129 UpdateVisibility(); | 129 UpdateVisibility(); |
130 } | 130 } |
131 | 131 |
132 } // namespace ash | 132 } // namespace ash |
OLD | NEW |