[Mac] First part of Omnibox decoration refactor. Enable ev bubble.

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 ContentSettingImageModel;
+class EVBubbleDecoration;
 @class ExtensionPopupController;
+class LocationIconDecoration;
 class Profile;
+class SelectedKeywordDecoration;
 class ToolbarModel;
 
 // A C++ bridge class that represents the location bar UI element to
 // the portable code.  Wires up an AutocompleteEditViewMac instance to
 // the location bar text field, which handles most of the work.
 
 class LocationBarViewMac : public AutocompleteEditController,
                            public LocationBar,
                            public LocationBarTesting,
                            public NotificationObserver {
@@ skipping 43 matching lines @@
   void SetStarred(bool starred);
 
   // Get the point on the star for the bookmark bubble to aim at.
   NSPoint GetBookmarkBubblePoint() const;
 
   // 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).
   void Update(const TabContents* tab, bool should_restore_state);
 
+  // Layout the various decorations which live in the field.
+  void Layout();
+
   // Returns the current TabContents.
   TabContents* GetTabContents() const;
 
   // Sets preview_enabled_ for the PageActionImageView associated with this
   // |page_action|. If |preview_enabled|, the location bar will display the
   // PageAction icon even if it has not been activated by the extension.
   // This is used by the ExtensionInstalledBubble to preview what the icon
   // will look like for the user upon installation of the extension.
   void SetPreviewEnabledPageAction(ExtensionAction* page_action,
                                    bool preview_enabled);
@@ skipping 19 matching lines @@
   virtual void OnChanged();
   virtual void OnInputInProgress(bool in_progress);
   virtual void OnKillFocus();
   virtual void OnSetFocus();
   virtual SkBitmap GetFavIcon() const;
   virtual std::wstring GetTitle() const;
 
   NSImage* GetTabButtonImage();
   AutocompleteTextField* GetAutocompleteTextField() { return field_; }
 
-  // Internals of OnChanged(), pulled out for purposes of unit
-  // testing.  Sets up |field| based on the parameters, which are
-  // pulled from edit_view->model().
-  static void OnChangedImpl(AutocompleteTextField* field,
-                            const std::wstring& keyword,
-                            const std::wstring& short_name,
-                            const bool is_keyword_hint,
-                            const bool is_extension_keyword,
-                            NSImage* image);
-
   // 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),
@@ skipping 43 matching lines @@
     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);
   };
 
-  // LocationIconView is used to display an icon to the left of the address.
-  class LocationIconView : public LocationBarImageView {
-   public:
-    explicit LocationIconView(LocationBarViewMac* owner);
-    virtual ~LocationIconView();
-
-    // Is draggable if the autocomplete edit view has not be changed.
-    virtual bool IsDraggable();
-
-    // Drag the URL and title from the current tab.
-    virtual NSPasteboard* GetDragPasteboard();
-
-    // Shows the page info dialog.
-    virtual void OnMousePressed(NSRect bounds);
-
-   private:
-    // The location bar view that owns us.
-    LocationBarViewMac* owner_;
-
-    DISALLOW_COPY_AND_ASSIGN(LocationIconView);
-  };
-
   // 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|.
@@ skipping 173 matching lines @@
     // The location bar view that owns us.
     LocationBarViewMac* owner_;
 
     Profile* profile_;
     ToolbarModel* toolbar_model_;
 
     DISALLOW_COPY_AND_ASSIGN(PageActionViewList);
   };
 
  private:
-  // Sets the location icon we should be showing.
-  void SetIcon(int resource_id);
-
-  // Sets the label for the SSL state.
-  void SetSecurityLabel();
-
   // Posts |notification| to the default notification center.
   void PostNotification(NSString* notification);
 
   // Updates visibility of the content settings icons based on the current
   // tab contents state.
   void RefreshContentSettingsViews();
 
   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
   // 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_;
+  // A decoration that shows an icon to the left of the address.
+  scoped_ptr<LocationIconDecoration> location_icon_decoration_;
 
-  // Security info as text which floats left of the page actions.
-  LocationBarImageView security_label_view_;
+  // A decoration that shows the keyword-search bubble on the left.
+  scoped_ptr<SelectedKeywordDecoration> selected_keyword_decoration_;
+
+  // 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.
   StarIconView star_icon_view_;
 
   // Any installed Page Actions.
   PageActionViewList page_action_views_;
 
   // The content blocked views.
   ContentSettingViews content_setting_views_;
 
@@ skipping 12 matching lines @@
   // 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_