Alternate NTP: Add search token to omnibox

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

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
index 07141150a1af9f413b3d690d09127057865a6223..a9e9d7d72894ffca9461acf2056a11603bf25f86 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
@@ -27,12 +27,15 @@ 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;
@@ -181,6 +184,8 @@ class LocationBarViewMac : public LocationBar,
   Browser* browser() const { return browser_; }
 
  private:
+  friend LocationBarViewMacBrowserTest;
+
   // Posts |notification| to the default notification center.
   void PostNotification(NSString* notification);
 
@@ -218,6 +223,9 @@ class LocationBarViewMac : public LocationBar,
   // 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.
@@ -235,9 +243,15 @@ class LocationBarViewMac : public LocationBar,
   // 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_;