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

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
@@ skipping 25 matching lines @@
                                 public ui::AnimationDelegate,
                                 public views::WidgetObserver,
                                 public TouchableLocationBarView {
  public:
   ContentSettingImageView(ContentSettingsType content_type,
                           LocationBarView* parent);
   virtual ~ContentSettingImageView();
 
   // |new_navigation| true if this is a new navigation, false if the tab was
   // just switched to.
-  void UpdateFromWebContents(content::WebContents* web_contents);
+  void Update(TabContents* tab_contents);
 
   // views::View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // ui::AnimationDelegate overrides:
   virtual void AnimationEnded(const ui::Animation* animation) OVERRIDE;
   virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
   virtual void AnimationCanceled(const ui::Animation* animation) OVERRIDE;
 
   // views::WidgetObserver override:
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
 
   // TouchableLocationBarView.
   virtual int GetBuiltInHorizontalPadding() const OVERRIDE;
 
+ protected:
+  virtual SkColor button_border_color() const;

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

virtual methods shouldn't be named named with unix_hacker_style. Also,
descriptions should be added for at least OnClick().

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

Done.

+  virtual SkColor gradient_top_color() const;
+  virtual SkColor gradient_bottom_color() const;
+  virtual void OnClick();
+
  private:
   // views::ImageView overrides:
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
 
   scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
 
   views::Widget* bubble_widget_;
 
   // The owning LocationBarView.
   LocationBarView* parent_;
 
   scoped_ptr<ui::SlideAnimation> slide_animator_;
   string16 animated_text_;
   bool pause_animation_;
   int text_size_;
   int visible_text_size_;
   gfx::Insets saved_insets_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingImageView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_