[Mac] Convert content settings to LocationBarDecoration, cleanup.

chrome/browser/cocoa/location_bar/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>
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/content_settings_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 @class AutocompleteTextField;
 class CommandUpdater;
+class ContentSettingDecoration;
 class ContentSettingImageModel;
 class EVBubbleDecoration;
 @class ExtensionPopupController;
 class LocationIconDecoration;
 class PageActionDecoration;
 class Profile;
 class SelectedKeywordDecoration;
 class StarDecoration;
 class ToolbarModel;
 
@@ skipping 90 matching lines @@
   NSImage* GetTabButtonImage();
   NSImage* GetKeywordImage(const std::wstring& keyword);
   AutocompleteTextField* GetAutocompleteTextField() { return field_; }
 
 
   // Overridden from NotificationObserver.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Used to display a clickable icon in the location bar.
-  class LocationBarImageView {
-   public:
-    explicit LocationBarImageView() : image_(nil),
-                                      label_(nil),
-                                      visible_(false) {}
-    virtual ~LocationBarImageView() {}
-
-    // Sets the image.
-    void SetImage(NSImage* 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.
-    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);
-
-    NSImage* GetImage() const { return image_; }
-    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 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) {}
-
-    // Called to get the icon's context menu. Return |nil| for no menu.
-    virtual NSMenu* GetMenu() { return nil; }
-
-   private:
-    scoped_nsobject<NSImage> image_;
-
-    // The label shown next to the icon, or nil if none.
-    scoped_nsobject<NSAttributedString> label_;
-
-    bool visible_;
-
-    DISALLOW_COPY_AND_ASSIGN(LocationBarImageView);
-  };
-
-  // ContentSettingImageView is used to display the content settings images
-  // on the current page.
-  class ContentSettingImageView : public LocationBarImageView {
-   public:
-    ContentSettingImageView(ContentSettingsType settings_type,
-                            LocationBarViewMac* owner,
-                            Profile* profile);
-    virtual ~ContentSettingImageView();
-
-    // Shows a content settings bubble.
-    void OnMousePressed(NSRect bounds);
-
-    // Updates the image and visibility state based on the supplied TabContents.
-    void UpdateFromTabContents(const TabContents* tab_contents);
-
-    // Returns the tooltip for this Page Action image or |nil| if there is none.
-    virtual NSString* GetToolTip();
-
-   private:
-    void SetToolTip(NSString* tooltip);
-
-    scoped_ptr<ContentSettingImageModel> content_setting_image_model_;
-
-    LocationBarViewMac* owner_;
-    Profile* profile_;
-    scoped_nsobject<NSString> tooltip_;
-
-    DISALLOW_COPY_AND_ASSIGN(ContentSettingImageView);
-  };
-  typedef ScopedVector<ContentSettingImageView> ContentSettingViews;
-
  private:
   // Posts |notification| to the default notification center.
   void PostNotification(NSString* notification);
 
   // Return the decoration for |page_action|.
   PageActionDecoration* GetPageActionDecoration(ExtensionAction* page_action);
 
   // Clear the page-action decorations.
   void DeletePageActionDecorations();
 
   // Re-generate the page-action decorations from the profile's
   // extension service.
   void RefreshPageActionDecorations();
 
   // Updates visibility of the content settings icons based on the current
   // tab contents state.
-  void RefreshContentSettingsViews();
+  void RefreshContentSettingsDecorations();
 
   void ShowFirstRunBubbleInternal(FirstRun::BubbleType bubble_type);
 
   scoped_ptr<AutocompleteEditViewMac> edit_view_;
 
   CommandUpdater* command_updater_;  // Weak, owned by Browser.
 
   AutocompleteTextField* field_;  // owned by tab controller
 
   // When we get an OnAutocompleteAccept notification from the autocomplete
@@ skipping 13 matching lines @@
   // A decoration that shows a lock icon and ev-cert label in a bubble
   // on the left.
   scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_;
 
   // Bookmark star right of page actions.
   scoped_ptr<StarDecoration> star_decoration_;
 
   // Any installed Page Actions.
   ScopedVector<PageActionDecoration> page_action_decorations_;
 
-  // The content blocked views.
-  ContentSettingViews content_setting_views_;
+  // The content blocked decorations.
+  ScopedVector<ContentSettingDecoration> content_setting_decorations_;
 
   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_;
 
   // Used to schedule a task for the first run info bubble.
   ScopedRunnableMethodFactory<LocationBarViewMac> first_run_bubble_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_