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/user/button_from_view.h" | 5 #include "ash/system/user/button_from_view.h" |
6 | 6 |
7 #include "ash/ash_constants.h" | 7 #include "ash/ash_constants.h" |
8 #include "ash/system/tray/tray_constants.h" | 8 #include "ash/system/tray/tray_constants.h" |
9 #include "ash/system/tray/tray_utils.h" | 9 #include "ash/system/tray/tray_utils.h" |
10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
| 12 #include "ui/accessibility/ax_enums.h" |
12 #include "ui/accessibility/ax_view_state.h" | 13 #include "ui/accessibility/ax_view_state.h" |
13 #include "ui/gfx/canvas.h" | 14 #include "ui/gfx/canvas.h" |
14 #include "ui/views/background.h" | 15 #include "ui/views/background.h" |
15 #include "ui/views/border.h" | 16 #include "ui/views/border.h" |
16 #include "ui/views/layout/box_layout.h" | 17 #include "ui/views/layout/box_layout.h" |
17 | 18 |
18 namespace ash { | 19 namespace ash { |
19 | 20 |
20 namespace { | 21 namespace { |
21 | 22 |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 button_hovered_ ? kHoverBackgroundColor : kBackgroundColor; | 103 button_hovered_ ? kHoverBackgroundColor : kBackgroundColor; |
103 content_->set_background( | 104 content_->set_background( |
104 views::Background::CreateSolidBackground(background_color)); | 105 views::Background::CreateSolidBackground(background_color)); |
105 set_background(views::Background::CreateSolidBackground(background_color)); | 106 set_background(views::Background::CreateSolidBackground(background_color)); |
106 } | 107 } |
107 SchedulePaint(); | 108 SchedulePaint(); |
108 } | 109 } |
109 | 110 |
110 } // namespace tray | 111 } // namespace tray |
111 } // namespace ash | 112 } // namespace ash |
OLD | NEW |