Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

chrome/browser/gtk/location_bar_view_gtk.h

Index: chrome/browser/gtk/location_bar_view_gtk.h
===================================================================
--- chrome/browser/gtk/location_bar_view_gtk.h	(revision 29822)
+++ chrome/browser/gtk/location_bar_view_gtk.h	(working copy)
@@ -120,6 +120,9 @@
    private:
     static gboolean OnButtonPressed(GtkWidget* sender, GdkEventButton* event,
                                     PageActionViewGtk* page_action_view);
+    static gboolean OnExposeEvent(GtkWidget* widget,
+                                  GdkEventExpose* event,
+                                  PageActionViewGtk* page_action_view);
 
     // The location bar view that owns us.
     LocationBarViewGtk* owner_;
@@ -156,6 +159,7 @@
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk);
   };
+  friend class PageActionViewGtk;
 
   static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event,
                                     gpointer userdata) {
Property changes on: chrome\browser\gtk\location_bar_view_gtk.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/gtk/location_bar_view_gtk.h:r29556