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

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

Issue 2843163003: Remove NetworkListDelegate (Closed)
Patch Set: Cleanup Created 3 years, 8 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
Index: ash/system/network/vpn_list_view.cc
diff --git a/ash/system/network/vpn_list_view.cc b/ash/system/network/vpn_list_view.cc
index e4c9df9d7a53d69929035ebcf057827d73e0dc07..e76cdc60771ad8d68d58d0194405b09d149560bc 100644
--- a/ash/system/network/vpn_list_view.cc
+++ b/ash/system/network/vpn_list_view.cc
@@ -16,7 +16,7 @@
#include "ash/system/network/network_icon.h"
#include "ash/system/network/network_icon_animation.h"
#include "ash/system/network/network_icon_animation_observer.h"
-#include "ash/system/network/network_list_delegate.h"
+#include "ash/system/network/network_state_list_detailed_view.h"
#include "ash/system/network/vpn_list.h"
#include "ash/system/tray/hover_highlight_view.h"
#include "ash/system/tray/system_menu_button.h"
@@ -244,7 +244,8 @@ void VPNListNetworkEntry::SetupConnectingItem(const base::string16& text,
} // namespace
-VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
+VPNListView::VPNListView(tray::NetworkStateListDetailedView* detailed_view)
+ : NetworkListViewBase(detailed_view) {
Shell::Get()->vpn_list()->AddObserver(this);
}
@@ -314,7 +315,7 @@ void VPNListView::Update() {
// Layout the updated list.
container()->SizeToPreferredSize();
- delegate_->RelayoutScrollList();
+ detailed_view()->RelayoutScrollList();
if (scroll_to_show_view) {
// Scroll the list so that |scroll_to_show_view| is in view.
@@ -357,7 +358,7 @@ void VPNListView::OnViewClicked(views::View* sender) {
// If the user clicked on a network entry, let the |delegate_| trigger a
// connection attempt (if the network is currently disconnected) or show a
// configuration dialog (if the network is currently connected or connecting).
- delegate_->OnNetworkEntryClicked(sender);
+ detailed_view()->OnNetworkEntryClicked(sender);
}
void VPNListView::AddNetwork(const chromeos::NetworkState* network) {
« ash/system/network/network_list_view_base.cc ('K') | « ash/system/network/vpn_list_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698