| Index: ash/common/system/chromeos/network/vpn_list_view.h
|
| diff --git a/ash/common/system/chromeos/network/vpn_list_view.h b/ash/common/system/chromeos/network/vpn_list_view.h
|
| index dc17fbc7b68dccb2b944c33b0ec21cff3b32a457..01cfdf4579fd54e1e899af948b4c237fb2a18db4 100644
|
| --- a/ash/common/system/chromeos/network/vpn_list_view.h
|
| +++ b/ash/common/system/chromeos/network/vpn_list_view.h
|
| @@ -8,17 +8,17 @@
|
| #include <map>
|
| #include <string>
|
|
|
| +#include "ash/common/system/chromeos/network/network_list_view_base.h"
|
| #include "ash/common/system/chromeos/network/vpn_delegate.h"
|
| #include "ash/common/system/tray/view_click_listener.h"
|
| #include "base/macros.h"
|
| #include "chromeos/network/network_state_handler.h"
|
| -#include "ui/chromeos/network/network_list_view_base.h"
|
|
|
| namespace chromeos {
|
| class NetworkState;
|
| }
|
|
|
| -namespace ui {
|
| +namespace ash {
|
| class NetworkListDelegate;
|
| }
|
|
|
| @@ -41,14 +41,14 @@ namespace ash {
|
| // attempt. Clicking on the currently connected or connecting network shows its
|
| // configuration dialog. Clicking on a provider shows the provider's "add
|
| // network" dialog.
|
| -class VPNListView : public ui::NetworkListViewBase,
|
| +class VPNListView : public NetworkListViewBase,
|
| public VPNDelegate::Observer,
|
| public ViewClickListener {
|
| public:
|
| - explicit VPNListView(ui::NetworkListDelegate* delegate);
|
| + explicit VPNListView(NetworkListDelegate* delegate);
|
| ~VPNListView() override;
|
|
|
| - // ui::NetworkListViewBase:
|
| + // NetworkListViewBase:
|
| void Update() override;
|
| bool IsNetworkEntry(views::View* view,
|
| std::string* service_path) const override;
|
| @@ -74,7 +74,7 @@ class VPNListView : public ui::NetworkListViewBase,
|
| void AddProvidersAndNetworks(
|
| const chromeos::NetworkStateHandler::NetworkStateList& networks);
|
|
|
| - ui::NetworkListDelegate* const delegate_;
|
| + NetworkListDelegate* const delegate_;
|
|
|
| // A mapping from each VPN provider's list entry to the provider's key.
|
| std::map<const views::View* const, VPNProvider::Key> provider_view_key_map_;
|
|
|