| 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/common/system/tray/tray_details_view.h" | 5 #include "ash/common/system/tray/tray_details_view.h" |
| 6 | 6 |
| 7 #include "ash/common/ash_view_ids.h" | 7 #include "ash/common/ash_view_ids.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/strings/grit/ash_strings.h" | 9 #include "ash/common/strings/grit/ash_strings.h" |
| 10 #include "ash/common/system/tray/system_menu_button.h" | 10 #include "ash/common/system/tray/system_menu_button.h" |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 DCHECK(!tri_view_); | 322 DCHECK(!tri_view_); |
| 323 DCHECK(!title_row_); | 323 DCHECK(!title_row_); |
| 324 | 324 |
| 325 if (UseMd()) { | 325 if (UseMd()) { |
| 326 tri_view_ = TrayPopupUtils::CreateDefaultRowView(); | 326 tri_view_ = TrayPopupUtils::CreateDefaultRowView(); |
| 327 | 327 |
| 328 back_button_ = CreateBackButton(); | 328 back_button_ = CreateBackButton(); |
| 329 tri_view_->AddView(TriView::Container::START, back_button_); | 329 tri_view_->AddView(TriView::Container::START, back_button_); |
| 330 | 330 |
| 331 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); | 331 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
| 332 auto label = TrayPopupUtils::CreateDefaultLabel(); | 332 auto* label = TrayPopupUtils::CreateDefaultLabel(); |
| 333 label->SetText(rb.GetLocalizedString(string_id)); | 333 label->SetText(rb.GetLocalizedString(string_id)); |
| 334 TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE); | 334 TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::TITLE); |
| 335 style.SetupLabel(label); | 335 style.SetupLabel(label); |
| 336 tri_view_->AddView(TriView::Container::CENTER, label); | 336 tri_view_->AddView(TriView::Container::CENTER, label); |
| 337 | 337 |
| 338 tri_view_->SetContainerVisible(TriView::Container::END, false); | 338 tri_view_->SetContainerVisible(TriView::Container::END, false); |
| 339 | 339 |
| 340 tri_view_->SetBorder(views::CreateEmptyBorder(kTitleRowPaddingTop, 0, | 340 tri_view_->SetBorder(views::CreateEmptyBorder(kTitleRowPaddingTop, 0, |
| 341 kTitleRowPaddingBottom, 0)); | 341 kTitleRowPaddingBottom, 0)); |
| 342 AddChildViewAt(tri_view_, 0); | 342 AddChildViewAt(tri_view_, 0); |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 if (index < child_count() - 1 && child_at(index + 1) != title_row_) | 501 if (index < child_count() - 1 && child_at(index + 1) != title_row_) |
| 502 scroll_border_->set_visible(true); | 502 scroll_border_->set_visible(true); |
| 503 else | 503 else |
| 504 scroll_border_->set_visible(false); | 504 scroll_border_->set_visible(false); |
| 505 } | 505 } |
| 506 | 506 |
| 507 views::View::OnPaintBorder(canvas); | 507 views::View::OnPaintBorder(canvas); |
| 508 } | 508 } |
| 509 | 509 |
| 510 } // namespace ash | 510 } // namespace ash |
| OLD | NEW |