| Index: ash/system/network/network_list.h
|
| diff --git a/ash/system/network/network_list.h b/ash/system/network/network_list.h
|
| index 09b18a4552ea99e7c2e25a080d8d601acf639fd4..7fcd2d448b54ea48462d919d03104e08e44edd5e 100644
|
| --- a/ash/system/network/network_list.h
|
| +++ b/ash/system/network/network_list.h
|
| @@ -14,7 +14,6 @@
|
| #include "ash/system/network/network_icon_animation_observer.h"
|
| #include "ash/system/network/network_info.h"
|
| #include "ash/system/network/network_state_list_detailed_view.h"
|
| -#include "ash/system/tray/tray_info_label.h"
|
| #include "base/macros.h"
|
| #include "chromeos/network/network_state_handler.h"
|
| #include "chromeos/network/network_type_pattern.h"
|
| @@ -33,8 +32,7 @@
|
| // A list of available networks of a given type. This class is used for all
|
| // network types except VPNs. For VPNs, see the |VPNList| class.
|
| class NetworkListView : public NetworkStateListDetailedView,
|
| - public network_icon::AnimationObserver,
|
| - public TrayInfoLabel::Delegate {
|
| + public network_icon::AnimationObserver {
|
| public:
|
| class SectionHeaderRowView;
|
|
|
| @@ -106,7 +104,7 @@
|
| // and is only modified if the info label is created or destroyed.
|
| void UpdateInfoLabel(int message_id,
|
| int insertion_index,
|
| - TrayInfoLabel** info_label_ptr);
|
| + InfoLabel** info_label_ptr);
|
|
|
| // Creates a cellular/tether/Wi-Fi header row |view| and adds it to
|
| // |scroll_content()| if necessary and reorders the |scroll_content()| placing
|
| @@ -118,10 +116,6 @@
|
| SectionHeaderRowView** view,
|
| views::Separator** separator_view);
|
|
|
| - // TrayInfoLabel::Delegate:
|
| - void OnLabelClicked(int message_id) override;
|
| - bool IsLabelClickable(int message_id) const override;
|
| -
|
| // network_icon::AnimationObserver:
|
| void NetworkIconChanged() override;
|
|
|
| @@ -131,8 +125,8 @@
|
|
|
| bool needs_relayout_;
|
|
|
| - TrayInfoLabel* no_wifi_networks_view_;
|
| - TrayInfoLabel* no_mobile_networks_view_;
|
| + InfoLabel* no_wifi_networks_view_;
|
| + InfoLabel* no_mobile_networks_view_;
|
| SectionHeaderRowView* mobile_header_view_;
|
| SectionHeaderRowView* wifi_header_view_;
|
| views::Separator* mobile_separator_view_;
|
|
|