Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2666)

Unified Diff: ash/common/system/chromeos/network/vpn_list_view.cc

Issue 2342793005: [ash-md] Adds Wi-Fi header row to system tray network detailed view (Closed)
Patch Set: [ash-md] Materializes system tray network detailed view (nits) Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ui/chromeos/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/network/vpn_list_view.cc
diff --git a/ash/common/system/chromeos/network/vpn_list_view.cc b/ash/common/system/chromeos/network/vpn_list_view.cc
index 3c3ed57ebe34756f20c95ba5d32c269b387a8e43..77778dfce0b03763e58d6445e264e4efffa11cd1 100644
--- a/ash/common/system/chromeos/network/vpn_list_view.cc
+++ b/ash/common/system/chromeos/network/vpn_list_view.cc
@@ -269,11 +269,11 @@ void VPNListView::Update() {
}
// Clear the list.
- container_->RemoveAllChildViews(true);
+ container()->RemoveAllChildViews(true);
provider_view_key_map_.clear();
network_view_service_path_map_.clear();
list_empty_ = true;
- container_->SetLayoutManager(
+ container()->SetLayoutManager(
new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
// Get the list of available VPN networks, in shill's priority order.
@@ -315,12 +315,12 @@ void VPNListView::Update() {
}
// Layout the updated list.
- container_->SizeToPreferredSize();
+ container()->SizeToPreferredSize();
delegate_->RelayoutScrollList();
if (scroll_to_show_view) {
// Scroll the list so that |scroll_to_show_view| is in view.
- container_->ScrollRectToVisible(scroll_to_show_view->bounds());
+ container()->ScrollRectToVisible(scroll_to_show_view->bounds());
}
}
@@ -358,7 +358,7 @@ void VPNListView::OnViewClicked(views::View* sender) {
void VPNListView::AddNetwork(const chromeos::NetworkState* network) {
views::View* entry(new VPNListNetworkEntry(this, network));
- container_->AddChildView(entry);
+ container()->AddChildView(entry);
network_view_service_path_map_[entry] = network->path();
list_empty_ = false;
}
@@ -372,13 +372,13 @@ void VPNListView::AddProviderAndNetworks(
views::Separator* const separator =
new views::Separator(views::Separator::HORIZONTAL);
separator->SetColor(kBorderLightColor);
- container_->AddChildView(separator);
+ container()->AddChildView(separator);
} else {
list_empty_ = false;
}
// Add a list entry for the VPN provider.
views::View* provider(new VPNListProviderEntry(this, name));
- container_->AddChildView(provider);
+ container()->AddChildView(provider);
provider_view_key_map_[provider] = key;
// Add the networks belonging to this provider, in the priority order returned
// by shill.
« no previous file with comments | « ash/common/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ui/chromeos/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698