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

Unified Diff: ash/system/chromeos/network/network_state_list_detailed_view.h

Issue 980943005: Add ash UI for third-party VPNs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@f_2_407541_434711_remove_combined_name
Patch Set: Updated after latest round of UI reviews. Created 5 years, 9 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/chromeos/network/network_state_list_detailed_view.h
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.h b/ash/system/chromeos/network/network_state_list_detailed_view.h
index 8487b997f0310cc5e60013aa3c1baf3288a63bff..2da014c4f0e374eaa6e4e13fc34a1cc43443770c 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -10,9 +10,9 @@
#include "ash/system/chromeos/network/network_detailed_view.h"
#include "ash/system/tray/view_click_listener.h"
#include "ash/system/user/login_status.h"
+#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
-#include "ui/chromeos/network/network_list.h"
#include "ui/chromeos/network/network_list_delegate.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/button/button.h"
@@ -21,6 +21,10 @@ namespace chromeos {
class NetworkTypePattern;
}
+namespace ui {
+class NetworkListViewBase;
+}
+
namespace views {
class BubbleDelegateView;
}
@@ -121,7 +125,6 @@ class NetworkStateListDetailedView
TrayPopupLabelButton* other_wifi_;
TrayPopupLabelButton* turn_on_wifi_;
TrayPopupLabelButton* other_mobile_;
- TrayPopupLabelButton* other_vpn_;
TrayPopupLabelButton* settings_;
TrayPopupLabelButton* proxy_settings_;
@@ -130,7 +133,7 @@ class NetworkStateListDetailedView
gfx::Image controlled_by_extension_icon_;
- ui::NetworkListView network_list_view_;
+ scoped_ptr<ui::NetworkListViewBase> network_list_view_;
DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
};
« no previous file with comments | « ash/metrics/user_metrics_recorder.cc ('k') | ash/system/chromeos/network/network_state_list_detailed_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698