Misc. cleanup

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

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.h b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
index 814c3035e1abbd8675352ce2ba3a1519e12dc4d6..68d1c5fcf0cd6cc8a12a560c7bbfa7ca4f6006c1 100644
--- a/chrome/browser/ui/views/location_bar/content_setting_image_view.h
+++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.h
@@ -61,6 +61,13 @@ class ContentSettingImageView : public IconLabelBubbleView,
   static const int kAnimationDurationMS;
 
   // IconLabelBubbleView:
+  const char* GetClassName() const override;
+  void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
+  bool OnMousePressed(const ui::MouseEvent& event) override;
+  void OnMouseReleased(const ui::MouseEvent& event) override;
+  bool OnKeyPressed(const ui::KeyEvent& event) override;
+  void OnGestureEvent(ui::GestureEvent* event) override;
+  void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
   SkColor GetTextColor() const override;
   SkColor GetBorderColor() const override;
   bool ShouldShowBackground() const override;
@@ -72,26 +79,17 @@ class ContentSettingImageView : public IconLabelBubbleView,
   void AnimationProgressed(const gfx::Animation* animation) override;
   void AnimationCanceled(const gfx::Animation* animation) override;
 
-  // views::View:
-  const char* GetClassName() const override;
-  void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
-  bool OnMousePressed(const ui::MouseEvent& event) override;
-  void OnMouseReleased(const ui::MouseEvent& event) override;
-  bool OnKeyPressed(const ui::KeyEvent& event) override;
-  void OnGestureEvent(ui::GestureEvent* event) override;
-  void OnNativeThemeChanged(const ui::NativeTheme* native_theme) override;
-
   // views::WidgetObserver:
   void OnWidgetDestroying(views::Widget* widget) override;
   void OnWidgetVisibilityChanged(views::Widget* widget, bool visible) override;
 
+  // Called when the user clicks the view; this freezes or cancels the animation

[varkha, 2016/03/30 03:03:42]

s/cancels/snaps to target?

[Peter Kasting, 2016/03/30 03:56:54]

Done.

+  // as necessary and then opens a content setting bubble.
   void OnClick();
 
+  // Updates the image and tooltip to match the current model state.
   void UpdateImage();
 
-  // Returns true if a related bubble is showing.
-  bool IsBubbleShowing() const;
-
   LocationBarView* parent_;  // Weak, owns us.
   scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
   gfx::SlideAnimation slide_animator_;