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

chrome/browser/gtk/location_bar_view_gtk.h

Index: chrome/browser/gtk/location_bar_view_gtk.h
diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h
index 32a5f9e4c8debf835f6165e2fca6244b5dfaf11c..82f9b1ea351d7e3c7ca6cb3b8669b7da3a7141e3 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/gtk/location_bar_view_gtk.h
@@ -120,6 +120,9 @@ class LocationBarViewGtk : public AutocompleteEditController,
    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 @@ class LocationBarViewGtk : public AutocompleteEditController,
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk);
   };
+  friend class PageActionViewGtk;
 
   static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event,
                                     gpointer userdata) {