[Mac] Rearrange SSL status icon/label in omnibox.

chrome/browser/cocoa/location_bar_view_mac.h

 // Copyright (c) 2010 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_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 135 matching lines @@
     void SetLabel(NSString* text, NSFont* baseFont, NSColor* color);
 
     // Sets the visibility. SetImage() should be called with a valid image
     // before the visibility is set to |true|.
     void SetVisible(bool visible);
 
     const NSImage* GetImage() const { return image_; }
     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; }
 
     // Called on mouse down.
     virtual void OnMousePressed(NSRect bounds) {}
 
     // Called to get the icon's context menu. Return |nil| for no menu.
     virtual NSMenu* GetMenu() { return nil; }
 
    private:
@@ skipping 33 matching lines @@
                         Profile* profile,
                         ExtensionAction* page_action);
     virtual ~PageActionImageView();
 
     ExtensionAction* page_action() { return page_action_; }
 
     int current_tab_id() { return current_tab_id_; }
 
     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);
 
     // Overridden from ImageLoadingTracker.
     virtual void OnImageLoaded(
         SkBitmap* image, ExtensionResource resource, int index);
 
     // Called to notify the Page Action that it should determine whether to be
     // visible or hidden. |contents| is the TabContents that is active, |url|
@@ skipping 155 matching lines @@
   // edit, we save the input string so we can give it back to the browser on
   // the LocationBar interface via GetInputString().
   std::wstring location_input_;
 
   // The user's desired disposition for how their input should be opened.
   WindowOpenDisposition disposition_;
 
   // 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_;
+
   // Any installed Page Actions.
   PageActionViewList page_action_views_;
 
   // The content blocked views.
   ContentSettingViews content_setting_views_;
 
   Profile* profile_;
 
   Browser* browser_;
 
   ToolbarModel* toolbar_model_;  // Weak, owned by Browser.
 
   // Image used in drawing keyword hint.
   scoped_nsobject<NSImage> tab_button_image_;
 
   // The transition type to use for the navigation.
   PageTransition::Type transition_;
 
   // Used to register for notifications received by NotificationObserver.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_