Revert "Added tooltips to stats bar items."

This reverts commit r57234

TBR: stevenjb

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

5 files changed, 5 insertions, 45 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 34586c2..55bc4d2 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9044,21 +9044,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_STATUSBAR_BATTERY_IS_CHARGED" desc="In the power menu button, the battery is charged message.">
         Battery is charged
       </message>
-      <message name="IDS_STATUSBAR_FEEDBACK_TOOLTIP" desc="Tooltip for the feedback status bar icon.">
-        Report a bug.
-      </message>
-      <message name="IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP" desc="Tooltip for the network menu status bar icon when no network is connected.">
-        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>
-      </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>
-      </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>
-      </message>
       <message name="IDS_VERSION_FIELD_PREFIX" desc="Display the OS version to the user.">
         OS version
       </message>
diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc
index f63593f..434f323 100644
--- a/chrome/browser/chromeos/status/clock_menu_button.cc
+++ b/chrome/browser/chromeos/status/clock_menu_button.cc
@@ -70,9 +70,7 @@ void ClockMenuButton::UpdateTextAndSetNextTimer() {
 }
 
 void ClockMenuButton::UpdateText() {
-  base::Time time(base::Time::Now());
-  SetText(base::TimeFormatTimeOfDay(time));
-  SetTooltipText(base::TimeFormatShortDate(time));
+  SetText(base::TimeFormatTimeOfDay(base::Time::Now()));
   SchedulePaint();
 }
 
diff --git a/chrome/browser/chromeos/status/feedback_menu_button.cc b/chrome/browser/chromeos/status/feedback_menu_button.cc
index d3b14d3..1b8ead6 100644
--- a/chrome/browser/chromeos/status/feedback_menu_button.cc
+++ b/chrome/browser/chromeos/status/feedback_menu_button.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
@@ -23,7 +22,6 @@ FeedbackMenuButton::FeedbackMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
       host_(host) {
   DCHECK(host_);
-  SetTooltipText(l10n_util::GetString(IDS_STATUSBAR_FEEDBACK_TOOLTIP));
 }
 
 FeedbackMenuButton::~FeedbackMenuButton() {
diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc
index 11e39fb..0070038 100644
--- a/chrome/browser/chromeos/status/network_menu_button.cc
+++ b/chrome/browser/chromeos/status/network_menu_button.cc
@@ -236,37 +236,19 @@ void NetworkMenuButton::NetworkChanged(NetworkLibrary* cros) {
         animation_connecting_.StartThrobbing(std::numeric_limits<int>::max());
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS1));
       }
-      std::string network_name = cros->wifi_connecting() ?
-          cros->wifi_name() : cros->cellular_name();
-      SetTooltipText(
-          l10n_util::GetStringF(IDS_STATUSBAR_NETWORK_CONNECTING_TOOLTIP,
-                                UTF8ToWide(network_name)));
     } else {
       // Stop connecting animation since we are not connecting.
       animation_connecting_.Stop();
 
       // Always show the higher priority connection first. Ethernet then wifi.
-      if (cros->ethernet_connected()) {
+      if (cros->ethernet_connected())
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_WIRED));
-        SetTooltipText(
-            l10n_util::GetStringF(
-                IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-                l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET)));
-      } else if (cros->wifi_connected()) {
+      else if (cros->wifi_connected())
         SetIcon(IconForNetworkStrength(cros->wifi_strength(), false));
-        SetTooltipText(l10n_util::GetStringF(
-            IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cros->wifi_name())));
-      } else if (cros->cellular_connected()) {
+      else if (cros->cellular_connected())
         SetIcon(IconForNetworkStrength(cros->cellular_strength(), false));
-        SetTooltipText(l10n_util::GetStringF(
-            IDS_STATUSBAR_NETWORK_CONNECTED_TOOLTIP,
-            UTF8ToWide(cros->cellular_name())));
-      } else {
+      else
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
-        SetTooltipText(l10n_util::GetString(
-            IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
-      }
     }
 
     if (!cros->Connected() && !cros->Connecting()) {
@@ -282,8 +264,6 @@ void NetworkMenuButton::NetworkChanged(NetworkLibrary* cros) {
   } else {
     SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS0));
     SetBadge(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_WARNING));
-    SetTooltipText(l10n_util::GetString(
-        IDS_STATUSBAR_NETWORK_NO_NETWORK_TOOLTIP));
   }
 
   SchedulePaint();
diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc
index b3da87d..98fb75e 100644
--- a/chrome/browser/chromeos/status/power_menu_button.cc
+++ b/chrome/browser/chromeos/status/power_menu_button.cc
@@ -173,7 +173,6 @@ void PowerMenuButton::UpdateIcon() {
       icon_id_ = cros->line_power_on() ?
           kChargingImages[index] : kDischargingImages[index];
     }
-    SetTooltipText(UTF16ToWide(GetLabelAt(0)));
   }
   SetIcon(*ResourceBundle::GetSharedInstance().GetBitmapNamed(icon_id_));
   SchedulePaint();