ContentSettingImageView cleanup, phase 3.

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

Index: chrome/browser/ui/views/location_bar/content_setting_image_view.h
===================================================================
--- chrome/browser/ui/views/location_bar/content_setting_image_view.h	(revision 202978)
+++ chrome/browser/ui/views/location_bar/content_setting_image_view.h	(working copy)
@@ -67,6 +67,7 @@
 
   // views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
@@ -79,7 +80,7 @@
     return slide_animator_.is_animating() || pause_animation_;
   }
 
-  // Invoked when the user clicks on the control.
+  int GetTotalSpacingWhileAnimating() const;
   void OnClick();
 
   LocationBarView* parent_;  // Weak, owns us.
@@ -92,10 +93,6 @@
   double pause_animation_state_;
   views::Widget* bubble_widget_;
 
-  // TODO(pkasting): Eliminate these.
-  gfx::Font font_;
-  int text_size_;
-
   DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);
 };