views: Do not show up a tooltip when hovering on the magnifying glass on NTP.

BUG=73252
TEST=see bug

Review URL: http://codereview.chromium.org/6539013

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

3 files changed, 15 insertions, 1 deletions

diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 19fd602..076fb70 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -828,6 +828,8 @@ void LocationBarView::OnChanged() {
   location_icon_view_->SetImage(
       ResourceBundle::GetSharedInstance().GetBitmapNamed(
           location_entry_->GetIcon()));
+  location_icon_view_->ShowTooltip(!location_entry()->IsEditingOrEmpty());
+
   Layout();
   SchedulePaint();
 
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc
index 0e70a66..66aad67 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc
@@ -27,3 +27,12 @@ void LocationIconView::OnMouseReleased(const views::MouseEvent& event,
                                        bool canceled) {
   click_handler_.OnMouseReleased(event, canceled);
 }
+
+void LocationIconView::ShowTooltip(bool show) {
+  if (show) {
+    SetTooltipText(UTF16ToWide(l10n_util::GetStringUTF16(
+            IDS_TOOLTIP_LOCATION_ICON)));
+  } else {
+    SetTooltipText(L"");
+  }
+}
diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.h b/chrome/browser/ui/views/location_bar/location_icon_view.h
index 7bc9c9d..55303ed 100644
--- a/chrome/browser/ui/views/location_bar/location_icon_view.h
+++ b/chrome/browser/ui/views/location_bar/location_icon_view.h
@@ -22,10 +22,13 @@ class LocationIconView : public views::ImageView {
   explicit LocationIconView(const LocationBarView* location_bar);
   virtual ~LocationIconView();
 
-  // Overridden from view.
+  // Overridden from views::ImageView:
   virtual bool OnMousePressed(const views::MouseEvent& event);
   virtual void OnMouseReleased(const views::MouseEvent& event, bool canceled);
 
+  // Whether we should show the tooltip for this icon or not.
+  void ShowTooltip(bool show);
+
  private:
   ClickHandler click_handler_;