[Mac] Convert omnibox keyword hint to decoration.

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>
@@ skipping 11 matching lines @@
 #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 KeywordHintDecoration;
 class LocationIconDecoration;
 class PageActionDecoration;
 class Profile;
 class SelectedKeywordDecoration;
 class StarDecoration;
 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.
@@ skipping 77 matching lines @@
       WindowOpenDisposition disposition,
       PageTransition::Type transition,
       const GURL& alternate_nav_url);
   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();
   NSImage* GetKeywordImage(const std::wstring& keyword);
+
   AutocompleteTextField* GetAutocompleteTextField() { return field_; }
 
 
   // Overridden from NotificationObserver.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   // Posts |notification| to the default notification center.
@@ skipping 41 matching lines @@
 
   // Bookmark star right of page actions.
   scoped_ptr<StarDecoration> star_decoration_;
 
   // Any installed Page Actions.
   ScopedVector<PageActionDecoration> page_action_decorations_;
 
   // The content blocked decorations.
   ScopedVector<ContentSettingDecoration> content_setting_decorations_;
 
+  // Keyword hint decoration displayed on the right-hand side.
+  scoped_ptr<KeywordHintDecoration> keyword_hint_decoration_;
+
   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_