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

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

Issue 1270623002: Replace 'Scanning' text in Network Status Area with throbber (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tooltips Created 5 years, 5 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 2da014c4f0e374eaa6e4e13fc34a1cc43443770c..c6fc816ea907b93d5f02128203814a7f366829ac 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.h
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.h
@@ -32,6 +32,7 @@ class BubbleDelegateView;
namespace ash {
class HoverHighlightView;
class SystemTrayItem;
+class ThrobberView;
class TrayPopupLabelButton;
namespace tray {
@@ -55,6 +56,9 @@ class NetworkStateListDetailedView
DetailedViewType GetViewType() const override;
void Update() override;
+ // Called by the WiFi Scanning Throbber when pressed.
+ bool ThrobberPressed(views::View* sender, const ui::Event& event);
+
protected:
// Overridden from ButtonListener.
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
@@ -67,7 +71,6 @@ class NetworkStateListDetailedView
// Create UI components.
void CreateHeaderEntry();
- void CreateHeaderButtons();
void CreateNetworkExtra();
// Update UI components.
@@ -118,6 +121,9 @@ class NetworkStateListDetailedView
// Track login state.
user::LoginStatus login_;
+ // Track WiFi scanning state.
+ bool wifi_scanning_;
+
// Child views.
TrayPopupHeaderButton* info_icon_;
TrayPopupHeaderButton* button_wifi_;
@@ -131,6 +137,9 @@ class NetworkStateListDetailedView
// A small bubble for displaying network info.
views::BubbleDelegateView* info_bubble_;
+ // WiFi scanning throbber.
+ ThrobberView* scanning_throbber_;
+
gfx::Image controlled_by_extension_icon_;
scoped_ptr<ui::NetworkListViewBase> network_list_view_;
« no previous file with comments | « ash/system/bluetooth/tray_bluetooth.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