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, 71 insertions, 37 deletions

diff --git a/chrome/browser/cocoa/location_bar_view_mac.h b/chrome/browser/cocoa/location_bar_view_mac.h
index 5a82d67..08e1524 100644
--- a/chrome/browser/cocoa/location_bar_view_mac.h
+++ b/chrome/browser/cocoa/location_bar_view_mac.h
@@ -24,7 +24,6 @@
 #include "third_party/skia/include/core/SkBitmap.h"
 
 @class AutocompleteTextField;
-class BubblePositioner;
 class CommandUpdater;
 class ContentSettingImageModel;
 @class ExtensionPopupController;
@@ -41,7 +40,6 @@ class LocationBarViewMac : public AutocompleteEditController,
                            public NotificationObserver {
  public:
   LocationBarViewMac(AutocompleteTextField* field,
-                     const BubblePositioner* bubble_positioner,
                      CommandUpdater* command_updater,
                      ToolbarModel* toolbar_model,
                      Profile* profile,
@@ -64,6 +62,9 @@ class LocationBarViewMac : public AutocompleteEditController,
   virtual void InvalidatePageActions();
   virtual void SaveStateToContents(TabContents* contents);
   virtual void Revert();
+  virtual const AutocompleteEditView* location_entry() const {
+    return edit_view_.get();
+  }
   virtual AutocompleteEditView* location_entry() {
     return edit_view_.get();
   }
@@ -76,6 +77,13 @@ class LocationBarViewMac : public AutocompleteEditController,
   virtual ExtensionAction* GetVisiblePageAction(size_t index);
   virtual void TestPageActionPressed(size_t index);
 
+  // Set/Get the editable state of the field.
+  void SetEditable(bool editable);
+  bool IsEditable();
+
+  // Set the starred state of the bookmark star.
+  void SetStarred(bool starred);
+
   // Updates the location bar.  Resets the bar's permanent text and
   // security style, and if |should_restore_state| is true, restores
   // saved state from the tab (for tab switching).
@@ -124,7 +132,6 @@ class LocationBarViewMac : public AutocompleteEditController,
                             const std::wstring& keyword,
                             const std::wstring& short_name,
                             const bool is_keyword_hint,
-                            const bool show_search_hint,
                             NSImage* image);
 
   // Overridden from NotificationObserver.
@@ -142,7 +149,9 @@ class LocationBarViewMac : public AutocompleteEditController,
 
     // Sets the image.
     void SetImage(NSImage* image);
-    void SetImage(SkBitmap* image);
+
+    // Get the |resource_id| image resource and set the image.
+    void SetIcon(int resource_id);
 
     // Sets the label text, font, and color. |text| may be nil; |color| and
     // |font| are ignored if |text| is nil.
@@ -156,9 +165,21 @@ class LocationBarViewMac : public AutocompleteEditController,
     const NSAttributedString* GetLabel() const { return label_; }
     bool IsVisible() const { return visible_; }
 
+    // Default size when no image is present.
+    virtual NSSize GetDefaultImageSize() const;
+
+    // Returns the size of the image, else the default size.
+    NSSize GetImageSize() const;
+
     // Returns the tooltip for this image view or |nil| if there is none.
     virtual const NSString* GetToolTip() { return nil; }
 
+    // Used to determinate if the item can act as a drag source.
+    virtual bool IsDraggable() { return false; }
+
+    // The drag pasteboard to use if a drag is initiated.
+    virtual NSPasteboard* GetDragPasteboard() { return nil; }
+
     // Called on mouse down.
     virtual void OnMousePressed(NSRect bounds) {}
 
@@ -176,42 +197,50 @@ class LocationBarViewMac : public AutocompleteEditController,
     DISALLOW_COPY_AND_ASSIGN(LocationBarImageView);
   };
 
-  // SecurityImageView is used to display the lock or warning icon when the
-  // current URL's scheme is https.
-  class SecurityImageView : public LocationBarImageView {
+  // LocationIconView is used to display an icon to the left of the address.
+  class LocationIconView : public LocationBarImageView {
    public:
-    enum Image {
-      LOCK = 0,
-      WARNING
-    };
+    explicit LocationIconView(LocationBarViewMac* owner);
+    virtual ~LocationIconView();
 
-    SecurityImageView(LocationBarViewMac* owner,
-                      Profile* profile,
-                      ToolbarModel* model);
-    virtual ~SecurityImageView();
+    // Is draggable if the autocomplete edit view has not be changed.
+    virtual bool IsDraggable();
 
-    // Sets the image to the appropriate icon.
-    void SetImageShown(Image image);
+    // Drag the URL and title from the current tab.
+    virtual NSPasteboard* GetDragPasteboard();
 
     // Shows the page info dialog.
     virtual void OnMousePressed(NSRect bounds);
 
    private:
-    // The lock icon shown when using HTTPS. Loaded lazily, the first time it's
-    // needed.
-    scoped_nsobject<NSImage> lock_icon_;
-
-    // The warning icon shown when HTTPS is broken. Loaded lazily, the first
-    // time it's needed.
-    scoped_nsobject<NSImage> warning_icon_;
-
     // The location bar view that owns us.
     LocationBarViewMac* owner_;
 
-    Profile* profile_;
-    ToolbarModel* model_;
+    DISALLOW_COPY_AND_ASSIGN(LocationIconView);
+  };
 
-    DISALLOW_COPY_AND_ASSIGN(SecurityImageView);
+  // Used to display the bookmark star in the RHS.
+  class StarIconView : public LocationBarImageView {
+   public:
+    explicit StarIconView(CommandUpdater* command_updater);
+    virtual ~StarIconView() {}
+
+    // Shows the bookmark bubble.
+    virtual void OnMousePressed(NSRect bounds);
+
+    // Set the image and tooltip based on |starred|.
+    void SetStarred(bool starred);
+
+    virtual const NSString* GetToolTip();
+
+   private:
+    // For bringing up bookmark bar.
+    CommandUpdater* command_updater_;  // Weak, owned by Browser.
+
+    // The string to show for a tooltip.
+    scoped_nsobject<NSString> tooltip_;
+
+    DISALLOW_COPY_AND_ASSIGN(StarIconView);
   };
 
   // PageActionImageView is used to display the icon for a given Page Action
@@ -231,14 +260,13 @@ class LocationBarViewMac : public AutocompleteEditController,
 
     void set_preview_enabled(bool enabled) { preview_enabled_ = enabled; }
 
-    bool preview_enabled() { return preview_enabled_; }
+    bool preview_enabled() const { return preview_enabled_; }
 
-    // Returns the size of the image, or a default size if no image available.
     // When a new page action is created, all the icons are destroyed and
     // recreated; at this point we need to calculate sizes to lay out the
     // icons even though no images are available yet.  For this case, we return
     // the default image size for a page icon.
-    virtual NSSize GetPreferredImageSize();
+    virtual NSSize GetDefaultImageSize() const;
 
     // Either notify listeners or show a popup depending on the Page Action.
     virtual void OnMousePressed(NSRect bounds);
@@ -384,11 +412,11 @@ class LocationBarViewMac : public AutocompleteEditController,
   };
 
  private:
-  // Sets the SSL icon we should be showing.
-  void SetSecurityIcon(ToolbarModel::Icon icon);
+  // Sets the location icon we should be showing.
+  void SetIcon(int resource_id);
 
-  // Sets the label for the SSL icon.
-  void SetSecurityIconLabel();
+  // Sets the label for the SSL state.
+  void SetSecurityLabel();
 
   // Posts |notification| to the default notification center.
   void PostNotification(const NSString* notification);
@@ -411,8 +439,14 @@ class LocationBarViewMac : public AutocompleteEditController,
   // The user's desired disposition for how their input should be opened.
   WindowOpenDisposition disposition_;
 
-  // The view that shows the lock/warning when in HTTPS mode.
-  SecurityImageView security_image_view_;
+  // A view that shows an icon to the left of the address.
+  LocationIconView location_icon_view_;
+
+  // Security info as text which floats left of the page actions.
+  LocationBarImageView security_label_view_;
+
+  // Bookmark star right of page actions.
+  StarIconView star_icon_view_;
 
   // Any installed Page Actions.
   PageActionViewList page_action_views_;