Index: chrome/browser/views/location_bar_view.h |
=================================================================== |
--- chrome/browser/views/location_bar_view.h (revision 29822) |
+++ chrome/browser/views/location_bar_view.h (working copy) |
@@ -356,6 +356,7 @@ |
// 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 @@ |
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 |
Property changes on: chrome\browser\views\location_bar_view.h |
___________________________________________________________________ |
Modified: svn:mergeinfo |
Merged /trunk/src/chrome/browser/views/location_bar_view.h:r29556 |