Re-instate the temporary revert from r45267. That reverted certain

Omnibox, toolbar, tab animations, and other UI changes for purposes of
testing and merging into mstone-5.

Additionally reverts these CLs to fix the earlier revert:
r45271: [Mac] Image references missing from Omnibox revert.
r45268: GTK fix merge failure in uber-revert.

Additional revert which fixed a bug for the branch:
r45381: [Mac] Omnibox popup icons and text lined up under toolbar.

Slight merge conflict which should be good:
r45322: GTK: Implement OnDragCanceled() for autocomplete...

Also ++kThemePackVersion and regenerate the cached theme pak.

Re-instated changes:
r45213: GTK: Override cursor colors in chrome-theme mode.
r45103: Support drawing nano tabs in the tabstrip.
r45084: GTK: Position the EV certificate stuff inside a green bubble.
r44979: Subclassing the InfoBubble to handle anchoring bubbles basedon...
r44957: GTK: Tint the geolocation icons in gtk mode.
r44943: Changes FormatURL to not strip http if the host starts with ft...
r44930: Remove an icon that is no longer used.
r44929: SSL UI changes, Windows, code side (images are separate).
r44859: SSL UI changes (icons).  TBRed since trybots hate binary patches.
r44822: GTK: Select better greens in the native omnibox popup.
r44814: GTK: navigate to URL on PRIMARY when middle-clicking the locat...
r44789: [Mac] Bookmark star missing on NTP and BMM.
r44775: [Mac] Centralize hack to make tests work with AutocompleteClas...
r44678: Display the SECURITY_WARNING status in the location bar for the
r44648: [Mac] Add an arrow cursor rect for the location image.
r44615: Revert r44611 because it may have broken "unit_tests" on "Vist...
r44611: Display the SECURITY_WARNING status in the location bar for the
r44577: Revert 44572 - [Mac] Update locationbar icon as user types.
r44572: [Mac] Update location-bar icon as user types.
r44555: GTK: Use correct button mask on reload button.
r44545: [Mac] Omnibox text drag drag URL when select-all.
r44523: GTK: Prevent inappropriate drag of location bar location icon.
r44519: GTK: make the primary selection include the url's scheme when ...
r44492: [Mac] Fix search icon in keyword search to be right-side-up.
r44415: GTK: Update top padding on icons in the autocomplete popup.
r44401: GTK: Tint omnibox icons in GTK mode differently.
r44380: GTK: Move reload in gtk mode and fix omnibox popup location.
r44282: Fixes crash in autocomplete when typing some URLs. The problem
r44273: [Mac] PDF icons for omnibox nits.
r44269: Fix build break due to bad merge resolve
r44268: Shift omnibox dropdown in and up on Windows, and square off th...
r44178: GTK: fix TTS padding.
r44177: Round the top left and right edges of the toolbar.
r44171: Images only checkin for try server goodness.
r44163: GTK: fix padding of autocomplete popup.
r44152: [Mac] PDF icons for omnibox.
r44145: GTK: Theme the icons in the location bar and use GTK colors fo...
r44140: Strips http from the omnibox
r44131: Fixes bugs in new tab strip animations where they weren't doin...
r44116: Change the default theme colors.
r44117: Add newline to EOF to fix CrOS builder.
r44115: Make the bottom edges of the opaque frame rounded.
r44091: [Mac] No star icon or page actions in omnibox on popups.
r44087: Don't allow drag or click on location icon when editing in omn...
r44021: [GTK] Add TTS lens graphic to linux TTS box.
r44008: [Mac] Tweak location icon spacing in omnibox.
r43977: GTK: don't show the star or page actions in ShouldOnlyShowLoca...
r43972: Make the firstrun bubble point at a better spot now that the l...
r43971: [Mac] Location icon in omnibox as drag source.
r43970: Make the star and page action icons not appear on popup windows.
r43954: Fixes bug in TabStrip where dragging tab out then back in rapidly
r43864: Tweaks to BoundsAnimator/SlideAnimation and TabStrip:
r43787: Allow location icon to be dragged & dropped.  This also fixes ...
r43759: Changes end cap of tab-to-search images.
r43740: Change bookmark bar toggle to ctrl-shift-b.
r43723: Show Page Info dialog on mouse up, not mouse down.
r43677: Fix Mac build failure.
r43676: Replace omnibox icons with new set that are all the same size ...
r43596: Fix browser test TestStarButtonAccObj.
r43593: Disables TestStarButtonAccObj.
r43582: Changes tab strip to use BoundsAnimator for tab strip animatio...
r43563: GTK: don't show reload button for popup/app windows.
r43562: Star/reload shuffle, Windows version.
r43540: [Mac] Magnifying glass in keyword-search bubble.
r43482: Adds images needed for new tab animation. I'm separating this ...
r43422: Add reload mask resource.
r43392: GTK: make the location icon a drag source.
r43376: [Mac] Move star button into page-actions area of omnibox.
r43357: [Mac] Line up omnibox popup under field.
r43290: gtk: fix display of icons in omnibox popup
r43269: GTK: fix reload button.
r43249: [Mac] Rearrange SSL status icon/label in omnibox.
r43248: BrowserThemePack: Adds persistant ids for the reload endcaps.
r43241: GTK: more location bar updates.
r43191: Fix memory leak in BrowserThemePack.
r43154: GTK: set the new star button's ID
r43151: Fix bad conflict resolution for r43146.
r43146: GTK: toolbar reload/star shuffle.
r43025: Show the location bar icon (almost) all the time, and have its...
r43023: Add new images for new reload button. No code change.
r42782: Remove this icon, now that it's no longer used (due to my secu...
r42502: Omnibox M5 work, part 1: Security changes
r42245: Check in new icons for omnibox security changes alone, so that...

BUG=none
TEST=People go back to complaining about missing http://.
R=pkasting@chromium.org,beng@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45474 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 70 insertions, 61 deletions

diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h
index 97ac60c6..fe9d26c 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.h
+++ b/chrome/browser/gtk/location_bar_view_gtk.h
@@ -10,6 +10,7 @@
 #include <map>
 #include <string>
 
+#include "app/gtk_signal.h"
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
@@ -30,7 +31,6 @@
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditViewGtk;
-class BubblePositioner;
 class Browser;
 class CommandUpdater;
 class ContentSettingImageModel;
@@ -47,8 +47,7 @@ class LocationBarViewGtk : public AutocompleteEditController,
                            public LocationBarTesting,
                            public NotificationObserver {
  public:
-  LocationBarViewGtk(const BubblePositioner* bubble_positioner,
-                     Browser* browser_);
+  explicit LocationBarViewGtk(Browser* browser);
   virtual ~LocationBarViewGtk();
 
   void Init(bool popup_window_mode);
@@ -78,6 +77,12 @@ 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,
@@ -104,6 +109,9 @@ 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();
   }
@@ -121,9 +129,8 @@ class LocationBarViewGtk : public AutocompleteEditController,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // 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];
+  // Edit background color.
+  static const GdkColor kBackgroundColor;
 
  private:
   class ContentSettingImageViewGtk : public InfoBubbleGtkDelegate {
@@ -141,12 +148,8 @@ class LocationBarViewGtk : public AutocompleteEditController,
     void UpdateFromTabContents(const TabContents* tab_contents);
 
    private:
-    static gboolean OnButtonPressedThunk(GtkWidget* sender,
-                                         GdkEvent* event,
-                                         ContentSettingImageViewGtk* view) {
-      return view->OnButtonPressed(sender, event);
-    }
-    gboolean OnButtonPressed(GtkWidget* sender, GdkEvent* event);
+    CHROMEGTK_CALLBACK_1(ContentSettingImageViewGtk, gboolean, OnButtonPressed,
+                         GdkEvent*);
 
     // InfoBubbleDelegate overrides:
     virtual void InfoBubbleClosing(InfoBubbleGtk* info_bubble,
@@ -208,19 +211,10 @@ class LocationBarViewGtk : public AutocompleteEditController,
     // with a debugger window attached. Returns true if a popup was shown.
     bool ShowPopup(bool devtools);
 
-    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);
+    CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnButtonPressed,
+                         GdkEvent*);
+    CHROMEGTK_CALLBACK_1(PageActionViewGtk, gboolean, OnExposeEvent,
+                         GdkEventExpose*);
 
     // The location bar view that owns us.
     LocationBarViewGtk* owner_;
@@ -268,20 +262,30 @@ class LocationBarViewGtk : public AutocompleteEditController,
   };
   friend class PageActionViewGtk;
 
-  static gboolean HandleExposeThunk(GtkWidget* widget, GdkEventExpose* event,
-                                    gpointer userdata) {
-    return reinterpret_cast<LocationBarViewGtk*>(userdata)->
-        HandleExpose(widget, event);
-  }
+  // 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();
 
-  gboolean HandleExpose(GtkWidget* widget, GdkEventExpose* event);
+  GtkWidget* site_type_area() { return site_type_alignment_; }
 
-  static gboolean OnSecurityIconPressed(GtkWidget* sender,
-                                        GdkEventButton* event,
-                                        LocationBarViewGtk* location_bar);
+  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*);
 
-  // Set the SSL icon we should be showing.
-  void SetSecurityIcon(ToolbarModel::Icon icon);
+  // Updates the site type area: changes the icon and shows/hides the EV
+  // certificate information.
+  void UpdateSiteTypeArea();
 
   // 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
@@ -296,29 +300,43 @@ class LocationBarViewGtk : public AutocompleteEditController,
 
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
-  static void OnEntryBoxSizeAllocateThunk(GtkWidget* widget,
-                                          GtkAllocation* allocation,
-                                          gpointer userdata) {
-    reinterpret_cast<LocationBarViewGtk*>(userdata)->
-        OnEntryBoxSizeAllocate(allocation);
-  }
-  void OnEntryBoxSizeAllocate(GtkAllocation* allocation);
-
-  // 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.
+  // 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();
+
+  // Returns true if we should only show the URL and none of the extras like
+  // the star button or page actions.
+  bool ShouldOnlyShowLocation();
+
   // The outermost widget we want to be hosted.
   OwnedWidgetGtk hbox_;
 
-  // SSL icons.
+  // Star button.
+  OwnedWidgetGtk star_;
+  GtkWidget* star_image_;
+  bool starred_;
+
+  // SSL state.
   GtkWidget* security_icon_event_box_;
-  GtkWidget* security_lock_icon_image_;
+  GtkWidget* ev_secure_icon_image_;
+  GtkWidget* secure_icon_image_;
   GtkWidget* security_warning_icon_image_;
-  // Toolbar info text (EV cert info).
-  GtkWidget* info_label_;
+  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_;
 
   // Content setting icons.
   OwnedWidgetGtk content_setting_hbox_;
@@ -339,9 +357,6 @@ 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_;
@@ -349,9 +364,6 @@ 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().
@@ -385,9 +397,6 @@ 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);
 };