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

Unified Diff: chrome/browser/chromeos/status/network_menu.h

Issue 3675002: Add network_menu_ui.cc and network_menu.js (Closed)
Patch Set: . Created 10 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
« no previous file with comments | « chrome/browser/chromeos/dom_ui/network_menu_ui.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/status/network_menu.h
diff --git a/chrome/browser/chromeos/status/network_menu.h b/chrome/browser/chromeos/status/network_menu.h
index d3a3b21a3da0268e58bd0fb8ed0835100bff3af3..acd9acc3b28c015c6eaeb790d4aca5faee875c96 100644
--- a/chrome/browser/chromeos/status/network_menu.h
+++ b/chrome/browser/chromeos/status/network_menu.h
@@ -9,9 +9,9 @@
#include <string>
#include <vector>
+#include "app/menus/menu_model.h"
#include "chrome/browser/chromeos/options/network_config_view.h"
#include "gfx/native_widget_types.h"
-#include "views/controls/menu/menu_2.h"
#include "views/controls/menu/view_menu_delegate.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -19,6 +19,10 @@ namespace gfx {
class Canvas;
}
+namespace views {
+class Menu2;
+}
+
namespace chromeos {
// Menu for network menu button in the status area/welcome screen.
@@ -47,9 +51,29 @@ namespace chromeos {
class NetworkMenu : public views::ViewMenuDelegate,
public menus::MenuModel {
public:
+ struct NetworkInfo {
+ NetworkInfo() : need_passphrase(false), remembered(true) {}
+ // "ethernet" | "wifi" | "cellular" | "other".
+ std::string network_type;
+ // "connected" | "connecting" | "disconnected" | "error".
+ std::string status;
+ // status message or error message, empty if unknown status.
+ std::string message;
+ // IP address (if network is active, empty otherwise)
+ std::string ip_address;
+ // true if the network requires a passphrase.
+ bool need_passphrase;
+ // true if the network is currently remembered.
+ bool remembered;
+ };
+
NetworkMenu();
virtual ~NetworkMenu();
+ // Retrieves network info for the DOMUI NetworkMenu (NetworkMenuUI).
+ // |index| is the index in menu_items_, set when the menu is built.
+ bool GetNetworkAt(int index, NetworkInfo* info) const;
+
// menus::MenuModel implementation.
virtual bool HasIcons() const { return true; }
virtual int GetItemCount() const;
@@ -150,7 +174,7 @@ class NetworkMenu : public views::ViewMenuDelegate,
MenuItemVector menu_items_;
// The network menu.
- views::Menu2 network_menu_;
+ scoped_ptr<views::Menu2> network_menu_;
// Holds minimum width or -1 if it wasn't set up.
int min_width_;
« no previous file with comments | « chrome/browser/chromeos/dom_ui/network_menu_ui.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698