Merge 29509 - Revert 29457, because this is making ExtensionBrowserTest.PageA...

chrome/browser/views/location_bar_view.h

Index: chrome/browser/views/location_bar_view.h
===================================================================
--- chrome/browser/views/location_bar_view.h	(revision 29821)
+++ chrome/browser/views/location_bar_view.h	(working copy)
@@ -356,7 +356,6 @@
 
     // Overridden from LocationBarImageView.
     virtual void ShowInfoBubble();
-    virtual void Paint(gfx::Canvas* canvas);
 
     // Overridden from ImageLoadingTracker.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
@@ -395,7 +394,6 @@
 
     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
___________________________________________________________________
Added: svn:mergeinfo
   Merged /trunk/src/chrome/browser/views/location_bar_view.h:r29509
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/views/location_bar_view.h:r69-2775