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

chrome/browser/gtk/location_bar_view_gtk.h

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
 #define CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 102 matching lines @@
     // visible or hidden. |contents| is the TabContents that is active, |url|
     // is the current page URL.
     void UpdateVisibility(TabContents* contents, GURL url);
 
     // A callback from ImageLoadingTracker for when the image has loaded.
     virtual void OnImageLoaded(SkBitmap* image, size_t index);
 
    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_;
 
     // The current profile (not owned by us).
     Profile* profile_;
 
     // The PageAction that this view represents. The PageAction is not owned by
     // us, it resides in the extension of this particular profile.
     const ExtensionAction* page_action_;
@@ skipping 16 matching lines @@
     OwnedWidgetGtk image_;
 
     // The tab id we are currently showing the icon for.
     int current_tab_id_;
 
     // The URL we are currently showing the icon for.
     GURL current_url_;
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewGtk);
   };
+  friend class PageActionViewGtk;
 
   static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event,
                                     gpointer userdata) {
     return reinterpret_cast<LocationBarViewGtk*>(userdata)->
         HandleExpose(widget, event);
   }
 
   gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event);
 
   static gboolean OnSecurityIconPressed(GtkWidget* sender,
@@ skipping 70 matching lines @@
 
   // Provides colors and rendering mode.
   GtkThemeProvider* theme_provider_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_LOCATION_BAR_VIEW_GTK_H_