diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 7 | ||||
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.h | 1 | ||||
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu_button.cc | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 169cfe0..67b25e9 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -10075,10 +10075,13 @@ Keep your key file in a safe place. You will need it to create new versions of y No network </message> <message name="IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP" desc="Tooltip for the network menu status bar icon when connecting to a network."> - Connecting to: <ph name="NAME">$1<ex>GoogleGuest</ex></ph> + Associating with <ph name="NAME">$1<ex>GoogleGuest</ex></ph> + </message> + <message name="IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP" desc="Tooltip for the network menu status bar icon when configure ip addres for a network."> + Configuring IP Address for <ph name="NAME">$1<ex>GoogleGuest</ex></ph> </message> <message name="IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP" desc="Tooltip for the network menu status bar icon when connected to a network."> - Network: <ph name="NAME">$1<ex>GoogleGuest</ex></ph> + Connected to <ph name="NAME">$1<ex>GoogleGuest</ex></ph> </message> <message name="IDS_STATUSBAR_CLOCK_TOOLTIP" desc="Tooltip for the clock in the status bar."> <ph name="DATE">$1<ex>Aug 16, 2010</ex></ph> diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h index 13711c0..2b83bec 100644 --- a/chrome/browser/chromeos/cros/network_library.h +++ b/chrome/browser/chromeos/cros/network_library.h @@ -40,6 +40,7 @@ class Network { ConnectionState connection_state() const { return state_; } bool connecting() const { return state_ == STATE_ASSOCIATION || state_ == STATE_CONFIGURATION || state_ == STATE_CARRIER; } + bool configuring() const { return state_ == STATE_CONFIGURATION; } bool connected() const { return state_ == STATE_READY; } bool connecting_or_connected() const { return connecting() || connected(); } bool failed() const { return state_ == STATE_FAILURE; } diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 4fb118c..12b8212 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -86,9 +86,14 @@ void NetworkMenuButton::NetworkChanged(NetworkLibrary* cros) { } std::string network_name = cros->wifi_connecting() ? cros->wifi_network().name() : cros->cellular_network().name(); + bool configuring = cros->wifi_connecting() ? + cros->wifi_network().configuring() : + cros->cellular_network().configuring(); SetTooltipText( - l10n_util::GetStringF(IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP, - UTF8ToWide(network_name))); + l10n_util::GetStringF(configuring ? + IDS_STATUSBAR_NETWORK_CONFIGURING_TOOLTIP : + IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP, + UTF8ToWide(network_name))); } else { // Stop connecting animation since we are not connecting. animation_connecting_.Stop(); |