Revert "Revert 29457, because this is making ExtensionBrowserTest.PageAction crash on Vista"

chrome/browser/views/location_bar_view.h

Index: chrome/browser/views/location_bar_view.h
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index fb8b2497fde0d3dee0a11a3c4c1cfccd517683e4..6290a9946448085a2f298d20b3d4b5314414bf38 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -356,6 +356,7 @@ class LocationBarView : public LocationBar,
 
     // Overridden from LocationBarImageView.
     virtual void ShowInfoBubble();
+    virtual void Paint(gfx::Canvas* canvas);
 
     // Overridden from ImageLoadingTracker.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
@@ -394,6 +395,7 @@ class LocationBarView : public LocationBar,
 
     DISALLOW_COPY_AND_ASSIGN(PageActionImageView);
   };
+  friend class PageActionImageView;
 
   // Both Layout and OnChanged call into this. This updates the contents
   // of the 3 views: selected_keyword, keyword_hint and type_search_view. If