[Mac] Star as a rhs-decoration in AutocompleteTextFieldCell.

chrome/browser/cocoa/location_bar/location_bar_view_mac.mm

 // 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.
 
 #import "chrome/browser/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/nsimage_cache_mac.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 #import "chrome/browser/app_controller_mac.h"
 #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/content_blocked_bubble_controller.h"
 #include "chrome/browser/cocoa/event_utils.h"
 #import "chrome/browser/cocoa/extensions/extension_action_context_menu.h"
 #import "chrome/browser/cocoa/extensions/extension_popup_controller.h"
 #import "chrome/browser/cocoa/first_run_bubble_controller.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/location_bar/ev_bubble_decoration.h"
 #import "chrome/browser/cocoa/location_bar/location_icon_decoration.h"
 #import "chrome/browser/cocoa/location_bar/selected_keyword_decoration.h"
+#import "chrome/browser/cocoa/location_bar/star_decoration.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/content_setting_image_model.h"
 #include "chrome/browser/content_setting_bubble_model.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/location_bar_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
@@ skipping 23 matching lines @@
                                              command_updater, field)),
       command_updater_(command_updater),
       field_(field),
       disposition_(CURRENT_TAB),
       location_icon_decoration_(new LocationIconDecoration(this)),
       selected_keyword_decoration_(
           new SelectedKeywordDecoration([field_ font])),
       ev_bubble_decoration_(
           new EVBubbleDecoration(location_icon_decoration_.get(),
                                  [field_ font])),
-      star_icon_view_(command_updater),
+      star_decoration_(new StarDecoration(command_updater)),
       page_action_views_(this, profile, toolbar_model),
       profile_(profile),
       browser_(browser),
       toolbar_model_(toolbar_model),
       transition_(PageTransition::TYPED),
       first_run_bubble_(this) {
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     ContentSettingImageView* content_setting_view =
         new ContentSettingImageView(static_cast<ContentSettingsType>(i), this,
                                     profile_);
     content_setting_views_.push_back(content_setting_view);
     content_setting_view->SetVisible(false);
   }
 
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  [cell setStarIconView:&star_icon_view_];
   [cell setPageActionViewList:&page_action_views_];
   [cell setContentSettingViewsList:&content_setting_views_];
 
   registrar_.Add(this,
       NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
       NotificationService::AllSources());
 }
 
 LocationBarViewMac::~LocationBarViewMac() {
   // Disconnect from cell in case it outlives us.
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
   [cell setPageActionViewList:NULL];
-  [cell setStarIconView:NULL];
+  [cell clearDecorations];
 }
 
 void LocationBarViewMac::ShowFirstRunBubble(FirstRun::BubbleType bubble_type) {
   // We need the browser window to be shown before we can show the bubble, but
   // we get called before that's happened.
   Task* task = first_run_bubble_.NewRunnableMethod(
       &LocationBarViewMac::ShowFirstRunBubbleInternal, bubble_type);
   MessageLoop::current()->PostTask(FROM_HERE, task);
 }
 
@@ skipping 237 matching lines @@
 void LocationBarViewMac::TestPageActionPressed(size_t index) {
   if (index >= page_action_views_.Count()) {
     NOTREACHED();
     return;
   }
   page_action_views_.OnMousePressed(NSZeroRect, index);
 }
 
 void LocationBarViewMac::SetEditable(bool editable) {
   [field_ setEditable:editable ? YES : NO];
-  star_icon_view_.SetVisible(editable);
+  star_decoration_->SetVisible(editable);
   UpdatePageActions();
   Layout();
 }
 
 bool LocationBarViewMac::IsEditable() {
   return [field_ isEditable] ? true : false;
 }
 
 void LocationBarViewMac::SetStarred(bool starred) {
-  star_icon_view_.SetStarred(starred);
+  star_decoration_->SetStarred(starred);
 
   // TODO(shess): The field-editor frame and cursor rects should not
   // change, here.
   [field_ updateCursorAndToolTipRects];
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ setNeedsDisplay:YES];
 }
 
 NSPoint LocationBarViewMac::GetBookmarkBubblePoint() const {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
-  NSRect frame = [cell starIconFrameForFrame:[field_ bounds]];
-  frame = [field_ convertRect:frame toView:nil];
-
-  // Star is not exactly centered horizontally, and the tip should
-  // point to the visual bottom of the star, not the middle.
-  return NSMakePoint(NSMidX(frame), NSMinY(frame) + 4.0);
+  const NSRect frame = [cell frameForDecoration:star_decoration_.get()
+                                        inFrame:[field_ bounds]];
+  const NSPoint point = star_decoration_->GetBubblePointInFrame(frame);
+  return [field_ convertPoint:point toView:nil];
 }
 
 NSImage* LocationBarViewMac::GetTabButtonImage() {
   if (!tab_button_image_) {
     SkBitmap* skiaBitmap = ResourceBundle::GetSharedInstance().
         GetBitmapNamed(IDR_LOCATION_BAR_KEYWORD_HINT_TAB);
     if (skiaBitmap) {
       tab_button_image_.reset([gfx::SkBitmapToNSImage(*skiaBitmap) retain]);
     }
   }
@@ skipping 74 matching lines @@
   return NSZeroSize;
 }
 
 NSSize LocationBarViewMac::LocationBarImageView::GetImageSize() const {
   NSImage* image = GetImage();
   if (image)
     return [image size];
   return GetDefaultImageSize();
 }
 
-// StarIconView-----------------------------------------------------------------
-
-LocationBarViewMac::StarIconView::StarIconView(CommandUpdater* command_updater)
-    : command_updater_(command_updater) {
-  SetVisible(true);
-  SetStarred(false);
-}
-
-void LocationBarViewMac::StarIconView::SetStarred(bool starred) {
-  if (starred) {
-    SetImage(AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_STAR_LIT));
-    tooltip_.reset(
-        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain]);
-  } else {
-    SetImage(AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_STAR));
-    tooltip_.reset(
-        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain]);
-  }
-}
-
-void LocationBarViewMac::StarIconView::OnMousePressed(NSRect bounds) {
-  command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
-}
-
-NSString* LocationBarViewMac::StarIconView::GetToolTip() {
-  return tooltip_.get();
-}
-
 // PageActionImageView----------------------------------------------------------
 
 LocationBarViewMac::PageActionImageView::PageActionImageView(
     LocationBarViewMac* owner,
     Profile* profile,
     ExtensionAction* page_action)
     : owner_(owner),
       profile_(profile),
       page_action_(page_action),
       tracker_(this),
@@ skipping 337 matching lines @@
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
 
   // Reset the left-hand decorations.
   // TODO(shess): Shortly, this code will live somewhere else, like in
   // the constructor.  I am still wrestling with how best to deal with
   // right-hand decorations, which are not a static set.
   [cell clearDecorations];
   [cell addLeftDecoration:location_icon_decoration_.get()];
   [cell addLeftDecoration:selected_keyword_decoration_.get()];
   [cell addLeftDecoration:ev_bubble_decoration_.get()];
+  [cell addRightDecoration:star_decoration_.get()];
 
   // By default only the location icon is visible.
   location_icon_decoration_->SetVisible(true);
   selected_keyword_decoration_->SetVisible(false);
   ev_bubble_decoration_->SetVisible(false);
 
   // Get the keyword to use for keyword-search and hinting.
   const std::wstring keyword(edit_view_->model()->keyword());
   std::wstring short_name;
   bool is_extension_keyword = false;
@@ skipping 56 matching lines @@
 
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
   // might change even when the rects don't change.
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ updateCursorAndToolTipRects];
 
   [field_ setNeedsDisplay:YES];
 }