New network menu button UI for ChromeOS.

Added ability to change label font in gtk menu item.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/650074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39516 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 0 deletions

diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index d863dbb..25e53eb 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -387,4 +387,15 @@ bool NetworkLibrary::Connected() const {
   return ethernet_connected() || wifi_connected() || cellular_connected();
 }
 
+const std::string& NetworkLibrary::IPAddress() const {
+  // Returns highest priority IP address.
+  if (ethernet_connected())
+    return ethernet_.ip_address;
+  if (wifi_connected())
+    return wifi_.ip_address;
+  if (cellular_connected())
+    return cellular_.ip_address;
+  return ethernet_.ip_address;
+}
+
 }  // namespace chromeos
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 57cef8c..94d5ba0 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -174,6 +174,9 @@ class NetworkLibrary : public URLRequestJobTracker::JobObserver {
   // Return true if any network is currently connected.
   bool Connected() const;
 
+  // Returns the current IP address if connected. If not, returns empty string.
+  const std::string& IPAddress() const;
+
   // Returns the current list of wifi networks.
   const WifiNetworkVector& wifi_networks() const { return wifi_networks_; }