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

Unified Diff: ui/chromeos/network/network_list_md.h

Issue 2342793005: [ash-md] Adds Wi-Fi header row to system tray network detailed view (Closed)
Patch Set: [ash-md] Materializes system tray network detailed view Created 4 years, 3 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: ui/chromeos/network/network_list_md.h
diff --git a/ui/chromeos/network/network_list.h b/ui/chromeos/network/network_list_md.h
similarity index 73%
copy from ui/chromeos/network/network_list.h
copy to ui/chromeos/network/network_list_md.h
index d58f456efe9db6af51eef092c259169d6619d520..390ca9cda97c1eeeea7c822df5282c9b31b10012 100644
--- a/ui/chromeos/network/network_list.h
+++ b/ui/chromeos/network/network_list_md.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
-#define UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
+#ifndef UI_CHROMEOS_NETWORK_NETWORK_LIST_MD_H_
+#define UI_CHROMEOS_NETWORK_NETWORK_LIST_MD_H_
#include <map>
#include <memory>
@@ -17,6 +17,7 @@
#include "ui/chromeos/network/network_list_view_base.h"
#include "ui/chromeos/ui_chromeos_export.h"
#include "ui/gfx/image/image_skia.h"
+#include "ui/views/controls/button/button.h"
namespace views {
class Label;
@@ -30,12 +31,13 @@ class NetworkListDelegate;
// 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 UI_CHROMEOS_EXPORT NetworkListView
+class UI_CHROMEOS_EXPORT NetworkListViewMd
: public NetworkListViewBase,
- public network_icon::AnimationObserver {
+ public network_icon::AnimationObserver,
+ public views::ButtonListener {
public:
- explicit NetworkListView(NetworkListDelegate* delegate);
- ~NetworkListView() override;
+ explicit NetworkListViewMd(NetworkListDelegate* delegate);
+ ~NetworkListViewMd() override;
// NetworkListViewBase:
void Update() override;
@@ -43,26 +45,34 @@ class UI_CHROMEOS_EXPORT NetworkListView
std::string* service_path) const override;
private:
+ class WiFiHeaderRowView;
+
void UpdateNetworks(
const chromeos::NetworkStateHandler::NetworkStateList& networks);
void UpdateNetworkIcons();
+ void OrderNetworks();
void UpdateNetworkListInternal();
void HandleRelayout();
bool UpdateNetworkListEntries(std::set<std::string>* new_service_paths);
bool UpdateNetworkChildren(std::set<std::string>* new_service_paths,
int* child_index,
- bool highlighted);
+ bool wifi);
bool UpdateNetworkChild(int index, const NetworkInfo* info);
bool PlaceViewAtIndex(views::View* view, int index);
bool UpdateInfoLabel(int message_id, int index, views::Label** label);
+ bool UpdateWiFiHeaderRow(bool enabled, int index, WiFiHeaderRowView** view);
// network_icon::AnimationObserver:
void NetworkIconChanged() override;
+ // views::ButtonListener:
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override;
+
NetworkListDelegate* delegate_;
views::Label* no_wifi_networks_view_;
views::Label* no_cellular_networks_view_;
+ WiFiHeaderRowView* wifi_header_view_;
// An owned list of network info.
std::vector<std::unique_ptr<NetworkInfo>> network_list_;
@@ -74,9 +84,9 @@ class UI_CHROMEOS_EXPORT NetworkListView
typedef std::map<std::string, views::View*> ServicePathMap;
ServicePathMap service_path_map_;
- DISALLOW_COPY_AND_ASSIGN(NetworkListView);
+ DISALLOW_COPY_AND_ASSIGN(NetworkListViewMd);
};
} // namespace ui
-#endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_
+#endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_MD_H_

Powered by Google App Engine
This is Rietveld 408576698