Revert Omnibox, toolbar, tab animations, and other UI changes for mstone-5.

Also ++kThemePackVersion and regenerate the cached theme pak.

That subset of r45267 which applies to the branch.

Reverted changes:
r44775: [Mac] Centralize hack to make tests work with AutocompleteClas...
r44555: GTK: Use correct button mask on reload button.
r44545: [Mac] Omnibox text drag drag URL when select-all.
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
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.
r43680: Fix Mac build, part 2.
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=waterfall r45267
R=pkasting@chromium.org,beng@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/branches/375/src@45275 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 63 deletions

diff --git a/chrome/browser/cocoa/autocomplete_text_field_cell.h b/chrome/browser/cocoa/autocomplete_text_field_cell.h
index 21963bc..1e0a3c5 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_cell.h
+++ b/chrome/browser/cocoa/autocomplete_text_field_cell.h
@@ -13,15 +13,7 @@ class ExtensionAction;
 
 // Holds a |LocationBarImageView| and its current rect. Do not keep references
 // to this object, only use it directly after calling |-layedOutIcons:|.
-// TODO(shess): This class is basically a helper for laying out the
-// icons.  Try to refactor it away.  If that is not reasonable, at
-// least split the image and label cases into subclasses once the
-// Omnibox stuff is settled.
 @interface AutocompleteTextFieldIcon : NSObject {
-  // YES to draw the label part of |view_|, otherwise draw the image
-  // part.
-  BOOL isLabel_;
-
   // The frame rect of |view_|.
   NSRect rect_;
 
@@ -29,20 +21,12 @@ class ExtensionAction;
   LocationBarViewMac::LocationBarImageView* view_;
 }
 
+// Returns a new AutocompleteTextFieldIcon object.
++ (AutocompleteTextFieldIcon*)
+    iconWithRect:(NSRect)rect
+            view:(LocationBarViewMac::LocationBarImageView*)view;
 @property(assign, nonatomic) NSRect rect;
 @property(assign, nonatomic) LocationBarViewMac::LocationBarImageView* view;
-
-- (id)initImageWithView:(LocationBarViewMac::LocationBarImageView*)view;
-- (id)initLabelWithView:(LocationBarViewMac::LocationBarImageView*)view;
-
-// Position |view_| right-justified in |frame|.
-- (void)positionInFrame:(NSRect)frame;
-
-// Draw image or label of |view_| in |rect_| within |controlView|.
-// Only call after |-positionInFrame:| has set |rect_| (or after an
-// explicit |-setRect:|).
-- (void)drawInView:(NSView*)controlView;
-
 @end
 
 // AutocompleteTextFieldCell extends StyledTextFieldCell to provide support for
@@ -60,17 +44,10 @@ class ExtensionAction;
   // side of the field.  Exclusive WRT |keywordString_|;
   scoped_nsobject<NSAttributedString> hintString_;
 
-  // The location icon sits at the left-hand side of the field.
-  // |keywordString_| overrides.
-  LocationBarViewMac::LocationIconView* locationIconView_;
-
-  // The star icon sits at the right-hand side of the field when an
-  // URL is being shown.
-  LocationBarViewMac::LocationBarImageView* starIconView_;
-
-  // The security label floats to the left of page actions at the
-  // right-hand side.
-  LocationBarViewMac::LocationBarImageView* securityLabelView_;
+  // View showing the state of the SSL connection. Owned by the location bar.
+  // Display is exclusive WRT the |hintString_| and |keywordString_|.
+  // This may be NULL during testing.
+  LocationBarViewMac::SecurityImageView* security_image_view_;
 
   // List of views showing visible Page Actions. Owned by the location bar.
   // Display is exclusive WRT the |hintString_| and |keywordString_|.
@@ -100,9 +77,7 @@ class ExtensionAction;
              availableWidth:(CGFloat)width;
 - (void)clearKeywordAndHint;
 
-- (void)setLocationIconView:(LocationBarViewMac::LocationIconView*)view;
-- (void)setStarIconView:(LocationBarViewMac::LocationBarImageView*)view;
-- (void)setSecurityLabelView:(LocationBarViewMac::LocationBarImageView*)view;
+- (void)setSecurityImageView:(LocationBarViewMac::SecurityImageView*)view;
 - (void)setPageActionViewList:(LocationBarViewMac::PageActionViewList*)list;
 - (void)setContentSettingViewsList:
     (LocationBarViewMac::ContentSettingViews*)views;
@@ -111,43 +86,25 @@ class ExtensionAction;
 // only visible icons.
 - (NSArray*)layedOutIcons:(NSRect)cellFrame;
 
-// Return the rectangle the star is being shown in, for purposes of
-// positioning the bookmark bubble.
-- (NSRect)starIconFrameForFrame:(NSRect)cellFrame;
-
-// Returns the portion of the cell to use for displaying the Page
-// Action icon at the given index. May be NSZeroRect if the index's
-// action is not visible.  This does a linear walk over all page
-// actions, so do not call this in a loop to get the position of all
-// page actions. Use |-layedOutIcons:| instead in that case.
-- (NSRect)pageActionFrameForIndex:(size_t)index inFrame:(NSRect)cellFrame;
 
 // Similar to |pageActionFrameForIndex:inFrame| but accepts an
 // ExtensionAction for when the index is not known.
 - (NSRect)pageActionFrameForExtensionAction:(ExtensionAction*)action
                                     inFrame:(NSRect)cellFrame;
 
-// Find the icon under the event.  |nil| if |theEvent| is not over
-// anything.
-- (AutocompleteTextFieldIcon*)iconForEvent:(NSEvent*)theEvent
-                                    inRect:(NSRect)cellFrame
-                                    ofView:(AutocompleteTextField*)controlView;
+// Returns the portion of the cell to use for displaying the Page Action icon
+// at the given index. May be NSZeroRect if the index's action is not visible.
+// This does a linear walk over all page actions, so do not call this in a loop
+// to get the position of all page actions. Use |-layedOutIcons:| instead in that
+// case.
+- (NSRect)pageActionFrameForIndex:(size_t)index inFrame:(NSRect)cellFrame;
 
 // Return the appropriate menu for any page actions under event.
 // Returns nil if no menu is present for the action, or if the event
 // is not over an action.
-- (NSMenu*)actionMenuForEvent:(NSEvent*)theEvent
+- (NSMenu*)actionMenuForEvent:(NSEvent*)event
                        inRect:(NSRect)cellFrame
-                       ofView:(AutocompleteTextField*)controlView;
-
-// Called by |AutocompleteTextField| to let page actions intercept
-// clicks.  Returns |YES| if the click has been intercepted.
-- (BOOL)mouseDown:(NSEvent*)theEvent
-           inRect:(NSRect)cellFrame
-           ofView:(AutocompleteTextField*)controlView;
-
-// If the location icon is draggable, return its drag pasteboard.
-- (NSPasteboard*)locationDragPasteboard;
+                       ofView:(NSView*)aView;
 
 @end
 
@@ -161,8 +118,8 @@ class ExtensionAction;
 // Returns the total number of installed Page Actions, visible or not.
 - (size_t)pageActionCount;
 
-// Returns the portion of the cell to use for displaying the location
-// icon.
-- (NSRect)locationIconFrameForFrame:(NSRect)cellFrame;
+// Returns the portion of the cell to use for displaying the security (SSL lock)
+// icon, leaving space for its label if any.
+- (NSRect)securityImageFrameForFrame:(NSRect)cellFrame;
 
 @end