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/common/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" | 9 #include "ash/common/system/tray/hover_highlight_view.h" |
10 #include "ash/common/system/tray/throbber_view.h" | 10 #include "ash/common/system/tray/throbber_view.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 } | 135 } |
136 | 136 |
137 void SpecialPopupRow::AddViewAfterContent(views::View* view, | 137 void SpecialPopupRow::AddViewAfterContent(views::View* view, |
138 bool add_separator) { | 138 bool add_separator) { |
139 if (!views_after_content_container_) { | 139 if (!views_after_content_container_) { |
140 views_after_content_container_ = CreateViewContainer(); | 140 views_after_content_container_ = CreateViewContainer(); |
141 AddChildView(views_after_content_container_); | 141 AddChildView(views_after_content_container_); |
142 } | 142 } |
143 | 143 |
144 if (add_separator) { | 144 if (add_separator) { |
145 views::Separator* separator = | 145 views::Separator* separator = new views::Separator(); |
146 new views::Separator(views::Separator::VERTICAL); | |
147 separator->SetColor(ash::kBorderDarkColor); | 146 separator->SetColor(ash::kBorderDarkColor); |
148 separator->SetBorder( | 147 separator->SetBorder( |
149 views::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0)); | 148 views::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0)); |
150 views_after_content_container_->AddChildView(separator); | 149 views_after_content_container_->AddChildView(separator); |
151 } | 150 } |
152 | 151 |
153 views_after_content_container_->AddChildView(view); | 152 views_after_content_container_->AddChildView(view); |
154 } | 153 } |
155 | 154 |
156 } // namespace ash | 155 } // namespace ash |
OLD | NEW |