1 files changed, 61 insertions, 70 deletions

diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h
index dd2db25..d31655b 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/gtk/location_bar_view_gtk.h
@@ -10,7 +10,6 @@
 #include <map>
 #include <string>
 
-#include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
@@ -31,6 +30,7 @@
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditViewGtk;
+class BubblePositioner;
 class Browser;
 class CommandUpdater;
 class ContentSettingImageModel;
@@ -47,7 +47,8 @@ class LocationBarViewGtk : public AutocompleteEditController,
                            public LocationBarTesting,
                            public NotificationObserver {
  public:
-  explicit LocationBarViewGtk(Browser* browser);
+  LocationBarViewGtk(const BubblePositioner* bubble_positioner,
+                     Browser* browser_);
   virtual ~LocationBarViewGtk();
 
   void Init(bool popup_window_mode);
@@ -77,12 +78,6 @@ class LocationBarViewGtk : public AutocompleteEditController,
   // restore saved state that the tab holds.
   void Update(const TabContents* tab_for_state_restoring);
 
-  // Show the bookmark bubble.
-  void ShowStarBubble(const GURL& url, bool newly_boomkarked);
-
-  // Set the starred state of the bookmark star.
-  void SetStarred(bool starred);
-
   // Implement the AutocompleteEditController interface.
   virtual void OnAutocompleteAccept(const GURL& url,
       WindowOpenDisposition disposition,
@@ -109,9 +104,6 @@ class LocationBarViewGtk : public AutocompleteEditController,
   virtual void InvalidatePageActions();
   virtual void SaveStateToContents(TabContents* contents);
   virtual void Revert();
-  virtual const AutocompleteEditView* location_entry() const {
-    return location_entry_.get();
-  }
   virtual AutocompleteEditView* location_entry() {
     return location_entry_.get();
   }
@@ -129,8 +121,9 @@ class LocationBarViewGtk : public AutocompleteEditController,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Edit background color.
-  static const GdkColor kBackgroundColor;
+  // Translation between a security level and the background color.  Both the
+  // location bar and edit have to manage and match the background color.
+  static const GdkColor kBackgroundColorByLevel[3];
 
  private:
   class ContentSettingImageViewGtk : public InfoBubbleGtkDelegate {
@@ -148,8 +141,12 @@ class LocationBarViewGtk : public AutocompleteEditController,
     void UpdateFromTabContents(const TabContents* tab_contents);
 
    private:
-    CHROMEGTK_CALLBACK_1(ContentSettingImageViewGtk, gboolean, OnButtonPressed,
-                         GdkEvent*);
+    static gboolean OnButtonPressedThunk(GtkWidget* sender,
+                                         GdkEvent* event,
+                                         ContentSettingImageViewGtk* view) {
+      return view->OnButtonPressed(sender, event);
+    }
+    gboolean OnButtonPressed(GtkWidget* sender, GdkEvent* event);
 
     // InfoBubbleDelegate overrides:
     virtual void InfoBubbleClosing(InfoBubbleGtk* info_bubble,
@@ -211,10 +208,19 @@ class LocationBarViewGtk : public AutocompleteEditController,
     // with a debugger window attached. Returns true if a popup was shown.
     bool ShowPopup(bool devtools);
 
-    CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnButtonPressed,
-                         GdkEvent*);
-    CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnExposeEvent,
-                         GdkEventExpose*);
+    static gboolean OnButtonPressedThunk(GtkWidget* sender,
+                                         GdkEvent* event,
+                                         PageActionViewGtk* page_action_view) {
+      return page_action_view->OnButtonPressed(sender, event);
+    }
+    gboolean OnButtonPressed(GtkWidget* sender, GdkEvent* event);
+
+    static gboolean OnExposeEventThunk(GtkWidget* widget,
+                                       GdkEventExpose* event,
+                                       PageActionViewGtk* page_action_view) {
+      return page_action_view->OnExposeEvent(widget, event);
+    }
+    gboolean OnExposeEvent(GtkWidget* widget, GdkEventExpose* event);
 
     // The location bar view that owns us.
     LocationBarViewGtk* owner_;
@@ -262,30 +268,20 @@ class LocationBarViewGtk : public AutocompleteEditController,
   };
   friend class PageActionViewGtk;
 
-  // Creates, initializes, and packs the location icon, EV certificate name,
-  // and optional border.
-  void BuildSiteTypeArea();
-
-  // Enable or disable the location icon/EV certificate as a drag source for
-  // the URL.
-  void SetSiteTypeDragSource();
+  static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event,
+                                    gpointer userdata) {
+    return reinterpret_cast<LocationBarViewGtk*>(userdata)->
+        HandleExpose(widget, event);
+  }
 
-  GtkWidget* site_type_area() { return site_type_alignment_; }
+  gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event);
 
-  CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, HandleExpose,
-                       GdkEventExpose*);
-  CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnIconReleased,
-                       GdkEventButton*);
-  CHROMEGTK_CALLBACK_4(LocationBarViewGtk, void, OnIconDragData,
-                       GdkDragContext*, GtkSelectionData*, guint, guint);
-  CHROMEGTK_CALLBACK_1(LocationBarViewGtk, void, OnEntryBoxSizeAllocate,
-                       GtkAllocation*);
-  CHROMEGTK_CALLBACK_1(LocationBarViewGtk, gboolean, OnStarButtonPress,
-                       GdkEventButton*);
+  static gboolean OnSecurityIconPressed(GtkWidget* sender,
+                                        GdkEventButton* event,
+                                        LocationBarViewGtk* location_bar);
 
-  // Updates the site type area: changes the icon and shows/hides the EV
-  // certificate information.
-  void UpdateSiteTypeArea();
+  // Set the SSL icon we should be showing.
+  void SetSecurityIcon(ToolbarModel::Icon icon);
 
   // Sets the text that should be displayed in the info label and its associated
   // tooltip text.  Call with an empty string if the info label should be
@@ -300,43 +296,29 @@ class LocationBarViewGtk : public AutocompleteEditController,
 
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
-  // Show or hide |tab_to_search_box_| and |tab_to_search_hint_| according to
-  // the value of |show_selected_keyword_|, |show_keyword_hint_|, and the
-  // available horizontal space in the location bar.
-  void AdjustChildrenVisibility();
-
-  // Build the star icon.
-  void CreateStarButton();
-
-  // Update the star icon after it is toggled or the theme changes.
-  void UpdateStarIcon();
+  static void OnEntryBoxSizeAllocateThunk(GtkWidget* widget,
+                                          GtkAllocation* allocation,
+                                          gpointer userdata) {
+    reinterpret_cast<LocationBarViewGtk*>(userdata)->
+        OnEntryBoxSizeAllocate(allocation);
+  }
+  void OnEntryBoxSizeAllocate(GtkAllocation* allocation);
 
-  // Returns true if we should only show the URL and none of the extras like
-  // the star button or page actions.
-  bool ShouldOnlyShowLocation();
+  // Show or hide |tab_to_search_box_|, |tab_to_search_hint_| and
+  // |type_to_search_hint_| according to the value of |show_selected_keyword_|,
+  // |show_keyword_hint_|, |show_search_hint_| and the available horizontal
+  // space in the location bar.
+  void AdjustChildrenVisibility();
 
   // The outermost widget we want to be hosted.
   OwnedWidgetGtk hbox_;
 
-  // Star button.
-  OwnedWidgetGtk star_;
-  GtkWidget* star_image_;
-  bool starred_;
-
-  // SSL state.
+  // SSL icons.
   GtkWidget* security_icon_event_box_;
-  GtkWidget* ev_secure_icon_image_;
-  GtkWidget* secure_icon_image_;
+  GtkWidget* security_lock_icon_image_;
   GtkWidget* security_warning_icon_image_;
-  GtkWidget* security_error_icon_image_;
-  // An icon to the left of the address bar.
-  GtkWidget* site_type_alignment_;
-  GtkWidget* site_type_event_box_;
-  GtkWidget* location_icon_image_;
-  bool enable_location_drag_;
-  // TODO(pkasting): Split this label off and move the rest of the items to the
-  // left of the address bar.
-  GtkWidget* security_info_label_;
+  // Toolbar info text (EV cert info).
+  GtkWidget* info_label_;
 
   // Content setting icons.
   OwnedWidgetGtk content_setting_hbox_;
@@ -357,6 +339,9 @@ class LocationBarViewGtk : public AutocompleteEditController,
   GtkWidget* tab_to_search_hint_icon_;
   GtkWidget* tab_to_search_hint_trailing_label_;
 
+  // Hint to user that the inputted text is not a keyword or url.
+  GtkWidget* type_to_search_hint_;
+
   scoped_ptr<AutocompleteEditViewGtk> location_entry_;
 
   Profile* profile_;
@@ -364,6 +349,9 @@ class LocationBarViewGtk : public AutocompleteEditController,
   ToolbarModel* toolbar_model_;
   Browser* browser_;
 
+  // We need to hold on to this just to it pass to the edit.
+  const BubblePositioner* bubble_positioner_;
+
   // When we get an OnAutocompleteAccept notification from the autocomplete
   // edit, we save the input string so we can give it back to the browser on
   // the LocationBar interface via GetInputString().
@@ -397,6 +385,9 @@ class LocationBarViewGtk : public AutocompleteEditController,
   // Indicate if |tab_to_search_hint_| should be shown.
   bool show_keyword_hint_;
 
+  // Indicate if |type_to_search_hint_| should be shown.
+  bool show_search_hint_;
+
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewGtk);
 };