| Index: ash/system/network/network_state_list_detailed_view.h
|
| diff --git a/ash/system/network/network_state_list_detailed_view.h b/ash/system/network/network_state_list_detailed_view.h
|
| index 50d87dc59541ec2a3be2e5230f99e8d07b340408..50e0b4170cfc699974c6382c6e566a1d2419f273 100644
|
| --- a/ash/system/network/network_state_list_detailed_view.h
|
| +++ b/ash/system/network/network_state_list_detailed_view.h
|
| @@ -9,7 +9,6 @@
|
| #include <string>
|
|
|
| #include "ash/login_status.h"
|
| -#include "ash/system/network/network_list_delegate.h"
|
| #include "ash/system/tray/tray_details_view.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -17,10 +16,6 @@
|
| #include "ui/views/controls/button/button.h"
|
| #include "ui/views/controls/button/custom_button.h"
|
|
|
| -namespace chromeos {
|
| -class NetworkTypePattern;
|
| -}
|
| -
|
| namespace ash {
|
| class NetworkListViewBase;
|
| }
|
| @@ -36,7 +31,6 @@ namespace tray {
|
|
|
| class NetworkStateListDetailedView
|
| : public TrayDetailsView,
|
| - public NetworkListDelegate,
|
| public base::SupportsWeakPtr<NetworkStateListDetailedView> {
|
| public:
|
| enum ListType { LIST_TYPE_NETWORK, LIST_TYPE_VPN };
|
| @@ -52,6 +46,11 @@ class NetworkStateListDetailedView
|
| // Manager properties (e.g. technology state) have changed.
|
| void Update();
|
|
|
| + // Called when the user clicks on an entry representing a network in the list.
|
| + void OnNetworkEntryClicked(views::View* sender);
|
| +
|
| + void RelayoutScrollList();
|
| +
|
| private:
|
| class InfoBubble;
|
|
|
| @@ -74,24 +73,9 @@ class NetworkStateListDetailedView
|
| void OnInfoBubbleDestroyed();
|
| views::View* CreateNetworkInfoView();
|
|
|
| - // Creates the view of an extra icon appearing next to the network name
|
| - // indicating that the network is controlled by an extension. If no extension
|
| - // is registered for this network, returns |nullptr|.
|
| - views::View* CreateControlledByExtensionView(const NetworkInfo& info);
|
| -
|
| // Periodically request a network scan.
|
| void CallRequestScan();
|
|
|
| - // NetworkListDelegate:
|
| - views::View* CreateViewForNetwork(const NetworkInfo& info) override;
|
| - chromeos::NetworkTypePattern GetNetworkTypePattern() const override;
|
| - void UpdateViewForNetwork(views::View* view,
|
| - const NetworkInfo& info) override;
|
| - views::Label* CreateInfoLabel() override;
|
| - void OnNetworkEntryClicked(views::View* sender) override;
|
| - void OnOtherWifiClicked() override;
|
| - void RelayoutScrollList() override;
|
| -
|
| // Type of list (all networks or vpn)
|
| ListType list_type_;
|
|
|
|
|