OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/common/system/tray/special_popup_row.h" | 5 #include "ash/system/tray/special_popup_row.h" |
6 | 6 |
7 #include "ash/common/ash_constants.h" | 7 #include "ash/common/ash_constants.h" |
8 #include "ash/common/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
9 #include "ash/common/system/tray/hover_highlight_view.h" | |
10 #include "ash/common/system/tray/throbber_view.h" | |
11 #include "ash/common/system/tray/tray_constants.h" | |
12 #include "ash/common/system/tray/tray_popup_header_button.h" | |
13 #include "ash/resources/grit/ash_resources.h" | 9 #include "ash/resources/grit/ash_resources.h" |
14 #include "ash/strings/grit/ash_strings.h" | 10 #include "ash/strings/grit/ash_strings.h" |
| 11 #include "ash/system/tray/hover_highlight_view.h" |
| 12 #include "ash/system/tray/throbber_view.h" |
| 13 #include "ash/system/tray/tray_constants.h" |
| 14 #include "ash/system/tray/tray_popup_header_button.h" |
15 #include "ui/base/resource/resource_bundle.h" | 15 #include "ui/base/resource/resource_bundle.h" |
16 #include "ui/gfx/canvas.h" | 16 #include "ui/gfx/canvas.h" |
17 #include "ui/gfx/geometry/insets.h" | 17 #include "ui/gfx/geometry/insets.h" |
18 #include "ui/gfx/geometry/rect.h" | 18 #include "ui/gfx/geometry/rect.h" |
19 #include "ui/views/background.h" | 19 #include "ui/views/background.h" |
20 #include "ui/views/border.h" | 20 #include "ui/views/border.h" |
21 #include "ui/views/controls/button/custom_button.h" | 21 #include "ui/views/controls/button/custom_button.h" |
22 #include "ui/views/controls/button/image_button.h" | 22 #include "ui/views/controls/button/image_button.h" |
23 #include "ui/views/controls/label.h" | 23 #include "ui/views/controls/label.h" |
24 #include "ui/views/controls/separator.h" | 24 #include "ui/views/controls/separator.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
146 separator->SetColor(ash::kBorderDarkColor); | 146 separator->SetColor(ash::kBorderDarkColor); |
147 separator->SetBorder( | 147 separator->SetBorder( |
148 views::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0)); | 148 views::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0)); |
149 views_after_content_container_->AddChildView(separator); | 149 views_after_content_container_->AddChildView(separator); |
150 } | 150 } |
151 | 151 |
152 views_after_content_container_->AddChildView(view); | 152 views_after_content_container_->AddChildView(view); |
153 } | 153 } |
154 | 154 |
155 } // namespace ash | 155 } // namespace ash |
OLD | NEW |