Refactor the content setting view to allow a subclass for the web intents button.

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/utf_string_conversions.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ skipping 51 matching lines @@
   TouchableLocationBarView::Init(this);
 }
 
 ContentSettingImageView::~ContentSettingImageView() {
   if (bubble_widget_) {
     bubble_widget_->RemoveObserver(this);
     bubble_widget_ = NULL;
   }
 }
 
-void ContentSettingImageView::UpdateFromWebContents(WebContents* web_contents) {
-  content_setting_image_model_->UpdateFromWebContents(web_contents);
+void ContentSettingImageView::Update(TabContents* tab_contents) {
+  if (tab_contents) {
+    content_setting_image_model_->UpdateFromWebContents(
+        tab_contents->web_contents());
+  }
   if (!content_setting_image_model_->is_visible()) {
     SetVisible(false);
     return;
   }
   SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
       content_setting_image_model_->get_icon()));
   SetTooltipText(UTF8ToUTF16(content_setting_image_model_->get_tooltip()));
   SetVisible(true);
 
   TabSpecificContentSettings* content_settings = NULL;
-  if (web_contents) {
-    content_settings =
-        TabContents::FromWebContents(web_contents)->content_settings();
-  }
+  if (tab_contents)
+    content_settings = tab_contents->content_settings();
+
   if (!content_settings || content_settings->IsBlockageIndicated(
       content_setting_image_model_->get_content_settings_type()))
     return;
 
   // The content blockage was not yet indicated to the user. Start indication
   // animation and clear "not yet shown" flag.
   content_settings->SetBlockageHasBeenIndicated(
       content_setting_image_model_->get_content_settings_type());
 
   int animated_string_id =
@@ skipping 59 matching lines @@
     const ui::Animation* animation) {
   AnimationEnded(animation);
 }
 
 bool ContentSettingImageView::OnMousePressed(const views::MouseEvent& event) {
   // We want to show the bubble on mouse release; that is the standard behavior
   // for buttons.
   return true;
 }
 
 void ContentSettingImageView::OnMouseReleased(const views::MouseEvent& event) {

[sky, 2012/08/07 03:33:00]

This class needs to override OnGestureEvent and treat ET_GESTURE_TAP as a click
too. 

[Greg Billock, 2012/08/07 19:29:04]

Done.

   if (!HitTest(event.location()))
     return;
 
+  OnClick();
+}
+
+void ContentSettingImageView::OnClick() {
   TabContents* tab_contents = parent_->GetTabContents();
   if (!tab_contents)
     return;
 
   // Stop animation.
   if (slide_animator_.get() && slide_animator_->is_animating()) {
     slide_animator_->Reset();
     pause_animation_ = true;
   }
 
@@ skipping 46 matching lines @@
 }
 
 void ContentSettingImageView::OnPaintBackground(gfx::Canvas* canvas) {
   if (slide_animator_.get() &&
       (slide_animator_->is_animating() || pause_animation_)) {
     // Paint yellow gradient background if in animation mode.
     const int kEdgeThickness = 1;
     SkPaint paint;
     paint.setShader(gfx::CreateGradientShader(kEdgeThickness,
                     height() - (2 * kEdgeThickness),
-                    kTopBoxColor, kBottomBoxColor));
+                    gradient_top_color(), gradient_bottom_color()));
     SkSafeUnref(paint.getShader());
     SkRect color_rect;
     color_rect.iset(0, 0, width() - 1, height() - 1);
     canvas->sk_canvas()->drawRoundRect(color_rect, kBoxCornerRadius,
                                        kBoxCornerRadius, paint);
     SkPaint outer_paint;
     outer_paint.setStyle(SkPaint::kStroke_Style);
-    outer_paint.setColor(kBorderColor);
+    outer_paint.setColor(button_border_color());
     color_rect.inset(SkIntToScalar(kEdgeThickness),
                      SkIntToScalar(kEdgeThickness));
     canvas->sk_canvas()->drawRoundRect(color_rect, kBoxCornerRadius,
                                        kBoxCornerRadius, outer_paint);
   } else {
     views::ImageView::OnPaintBackground(canvas);
     return;
   }
 }
 
 void ContentSettingImageView::OnWidgetClosing(views::Widget* widget) {
   if (bubble_widget_) {
     bubble_widget_->RemoveObserver(this);
     bubble_widget_ = NULL;
   }
   if (pause_animation_) {
     slide_animator_->Reset(
         1.0 - (visible_text_size_ * kAnimatingFraction) / text_size_);
     pause_animation_ = false;
     slide_animator_->Show();
   }
 }
 
 int ContentSettingImageView::GetBuiltInHorizontalPadding() const {
   return GetBuiltInHorizontalPaddingImpl();
 }
 
+SkColor ContentSettingImageView::button_border_color() const {

[sky, 2012/08/07 03:33:00]

Order doesn't match header.

[Greg Billock, 2012/08/07 19:29:04]

These are right under GetBuiltInHorizontalPadding in the header.

I left OnClick in-place in the .cc file since it made the diff a lot easier to
read. I can copy-paste it to the bottom here, but the private methods are out of
order as it is, so I'm not sure it'd help predictability much.

+  return kBorderColor;
+}
+
+SkColor ContentSettingImageView::gradient_top_color() const {
+  return kTopBoxColor;
+}
+
+SkColor ContentSettingImageView::gradient_bottom_color() const {
+  return kBottomBoxColor;
+}