Fix tooltip text for ContentSettingImageView.

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 129 matching lines @@
 }
 
 void ContentSettingImageView::OnGestureEvent(ui::GestureEvent* event) {
   if (event->type() == ui::ET_GESTURE_TAP)
     OnActivate(*event);
   if ((event->type() == ui::ET_GESTURE_TAP) ||
       (event->type() == ui::ET_GESTURE_TAP_DOWN))
     event->SetHandled();
 }
 
+bool ContentSettingImageView::GetTooltipText(const gfx::Point& p,
+                      base::string16* tooltip) const {
+  tooltip->assign(content_setting_image_model_->get_tooltip());

[Peter Kasting, 2016/09/08 21:51:50]

Nit: Or just

  *tooltip = content_setting_image_model_->get_tooltip();

[Evan Stade, 2016/09/09 18:48:01]

Done.

+  return !tooltip->empty();
+}
+
 void ContentSettingImageView::OnNativeThemeChanged(
     const ui::NativeTheme* native_theme) {
   if (ui::MaterialDesignController::IsModeMaterial())
     UpdateImage();
 
   IconLabelBubbleView::OnNativeThemeChanged(native_theme);
 }
 
 bool ContentSettingImageView::ShouldShowInkDropForFocus() const {
   return true;
@@ skipping 119 matching lines @@
 
 void ContentSettingImageView::OnWidgetVisibilityChanged(views::Widget* widget,
                                                         bool visible) {
   // |widget| is a bubble that has just got shown / hidden.
   if (!visible && !label()->visible())
     AnimateInkDrop(views::InkDropState::DEACTIVATED, nullptr /* event */);
 }
 
 void ContentSettingImageView::UpdateImage() {
   SetImage(content_setting_image_model_->GetIcon(GetTextColor()).AsImageSkia());
-  image()->SetTooltipText(content_setting_image_model_->get_tooltip());
 }