Alternate NTP: Add search token to omnibox

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

 // Copyright (c) 2012 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_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/prefs/public/pref_member.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/content_settings_types.h"
 
 @class AutocompleteTextField;
 class CommandUpdater;
 class ContentSettingDecoration;
 class EVBubbleDecoration;
 class KeywordHintDecoration;
+class LocationBarViewMacBrowserTest;

[kuan, 2013/01/23 17:01:32]

nit: wrong alphabetical order

[sail, 2013/01/27 21:11:07]

Done.

 class LocationBarDecoration;
 class LocationIconDecoration;
 class PageActionDecoration;
 class PlusDecoration;
 class Profile;
+class SearchTokenDecoration;
 class SelectedKeywordDecoration;
+class SeparatorDecoration;
 class StarDecoration;
 class ToolbarModel;
 class WebIntentsButtonDecoration;
 class ZoomDecoration;
 
 // A C++ bridge class that represents the location bar UI element to
 // the portable code.  Wires up an OmniboxViewMac instance to
 // the location bar text field, which handles most of the work.
 
 class LocationBarViewMac : public LocationBar,
@@ skipping 128 matching lines @@
 
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   Browser* browser() const { return browser_; }
 
  private:
+  friend LocationBarViewMacBrowserTest;
+
   // 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();
 
   void OnEditBookmarksEnabledChanged();
@@ skipping 17 matching lines @@
 
   // Updates the zoom decoration in the omnibox with the current zoom level.
   void UpdateZoomDecoration();
 
   // Ensures the star decoration is visible or hidden, as required.
   void UpdateStarDecorationVisibility();
 
   // Ensures the plus decoration is visible or hidden, as required.
   void UpdatePlusDecorationVisibility();
 
+  // Gets the current search provider name.
+  string16 GetSearchProviderName() const;
+
   scoped_ptr<OmniboxViewMac> omnibox_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().
   string16 location_input_;
 
   // The user's desired disposition for how their input should be opened.
   WindowOpenDisposition disposition_;
 
   // A decoration that shows an icon to the left of the address.
   scoped_ptr<LocationIconDecoration> location_icon_decoration_;
 
+  // A decoration that shows the search provider being used.
+  scoped_ptr<SearchTokenDecoration> search_token_decoration_;
+
   // A decoration that shows the keyword-search bubble on the left.
   scoped_ptr<SelectedKeywordDecoration> selected_keyword_decoration_;
 
+  // A decoration used to draw a separator between other decorations.
+  scoped_ptr<SeparatorDecoration> separator_decoration_;
+
   // A decoration that shows a lock icon and ev-cert label in a bubble
   // on the left.
   scoped_ptr<EVBubbleDecoration> ev_bubble_decoration_;
 
   // Action "plus" button right of bookmark star.
   scoped_ptr<PlusDecoration> plus_decoration_;
 
   // Bookmark star right of page actions.
   scoped_ptr<StarDecoration> star_decoration_;
 
@@ skipping 32 matching lines @@
   // Used to schedule a task for the first run info bubble.
   base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;
 
   // Used to change the visibility of the star decoration.
   BooleanPrefMember edit_bookmarks_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_