Chromium Code Reviews| Index: ash/common/system/chromeos/network/network_state_list_detailed_view.cc |
| diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc |
| index f1c30a43488acfa4b6b8bb670519f78d41024406..7bcb826e95f458227fdce58013a047f2a536ac15 100644 |
| --- a/ash/common/system/chromeos/network/network_state_list_detailed_view.cc |
| +++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.cc |
| @@ -478,10 +478,13 @@ void NetworkStateListDetailedView::CreateExtraTitleRowButtons() { |
| if (login_ == LoginStatus::LOCKED) |
| return; |
| + DCHECK(tri_view()); |
|
bruthig
2016/11/14 04:39:11
nit: not needed.
tdanderson
2016/11/14 19:24:58
Done.
|
| + tri_view()->SetContainerVisible(TriView::Container::END, true); |
| + |
| info_button_md_ = new SystemMenuButton( |
| this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuInfoIcon, |
| IDS_ASH_STATUS_TRAY_NETWORK_INFO); |
| - title_row()->AddViewToTitleRow(info_button_md_); |
| + tri_view()->AddView(TriView::Container::END, info_button_md_); |
| if (login_ != LoginStatus::NOT_LOGGED_IN) { |
| settings_button_md_ = new SystemMenuButton( |
| @@ -495,7 +498,7 @@ void NetworkStateListDetailedView::CreateExtraTitleRowButtons() { |
| if (!WmShell::Get()->system_tray_delegate()->ShouldShowSettings()) |
| settings_button_md_->SetState(views::Button::STATE_DISABLED); |
| - title_row()->AddViewToTitleRow(settings_button_md_); |
| + tri_view()->AddView(TriView::Container::END, settings_button_md_); |
| } else { |
| proxy_settings_button_md_ = new SystemMenuButton( |
| this, SystemMenuButton::InkDropStyle::SQUARE, kSystemMenuSettingsIcon, |
| @@ -661,7 +664,10 @@ void NetworkStateListDetailedView::UpdateHeaderButtons() { |
| } |
| } |
| - static_cast<views::View*>(title_row())->Layout(); |
| + if (UseMd()) |
| + Layout(); |
|
bruthig
2016/11/14 04:39:11
nit: I don't think this is needed since NetworkSta
tdanderson
2016/11/14 19:24:58
Done.
|
| + else |
| + static_cast<views::View*>(title_row())->Layout(); |
| } |
| void NetworkStateListDetailedView::SetScanningStateForThrobberView( |