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

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

Issue 2429923002: Implement all system menu title row buttons for Ash MD (Closed)
Patch Set: OS_WIN define in tests Created 4 years, 2 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/common/system/chromeos/network/network_state_list_detailed_view.h
diff --git a/ash/common/system/chromeos/network/network_state_list_detailed_view.h b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
index 70172eddb788c4e5a614965efb5ef99baa0a9c4d..3653ef4ac72fe53bc4151af0d9eb429bb385627d 100644
--- a/ash/common/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/common/system/chromeos/network/network_state_list_detailed_view.h
@@ -15,6 +15,7 @@
#include "ui/chromeos/network/network_list_delegate.h"
#include "ui/gfx/image/image.h"
#include "ui/views/controls/button/button.h"
+#include "ui/views/controls/button/custom_button.h"
namespace chromeos {
class NetworkTypePattern;
@@ -62,7 +63,9 @@ class NetworkStateListDetailedView
void HandleButtonPressed(views::Button* sender,
const ui::Event& event) override;
void CreateExtraTitleRowButtons() override;
- void ShowSettings() override;
+
+ // Launches the WebUI settings in a browser and closes the system menu.
+ void ShowSettings();
// Create UI components.
void CreateHeaderEntry();
@@ -128,6 +131,7 @@ class NetworkStateListDetailedView
// scanning state.
bool prev_wifi_scanning_state_;
+ // Not used for material design.
views::ImageButton* info_icon_;
// Not used for material design.
@@ -142,6 +146,11 @@ class NetworkStateListDetailedView
TrayPopupLabelButton* settings_;
TrayPopupLabelButton* proxy_settings_;
+ // Only used in material design.
+ views::CustomButton* info_button_md_;
+ views::CustomButton* settings_button_md_;
+ views::CustomButton* proxy_settings_button_md_;
+
// A small bubble for displaying network info.
views::BubbleDialogDelegateView* info_bubble_;

Powered by Google App Engine
This is Rietveld 408576698