[Mac] Move star button into page-actions area of omnibox.

chrome/browser/cocoa/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_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"
@@ skipping 87 matching lines @@
     ToolbarModel* toolbar_model,
     Profile* profile,
     Browser* browser)
     : edit_view_(new AutocompleteEditViewMac(this, bubble_positioner,
           toolbar_model, profile, command_updater, field)),
       command_updater_(command_updater),
       field_(field),
       disposition_(CURRENT_TAB),
       location_icon_view_(this),
       security_label_view_(),
+      star_icon_view_(command_updater),
       page_action_views_(this, profile, toolbar_model),
       profile_(profile),
       browser_(browser),
       toolbar_model_(toolbar_model),
       transition_(PageTransition::TYPED) {
   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 setLocationIconView:&location_icon_view_];
   [cell setSecurityLabelView:&security_label_view_];
+  [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 setLocationIconView:NULL];
   [cell setSecurityLabelView:NULL];
+  [cell setStarIconView:NULL];
 }
 
 std::wstring LocationBarViewMac::GetInputString() const {
   return location_input_;
 }
 
 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {
   return disposition_;
 }
 
@@ skipping 294 matching lines @@
 }
 
 void LocationBarViewMac::TestPageActionPressed(size_t index) {
   if (index >= page_action_views_.Count()) {
     NOTREACHED();
     return;
   }
   page_action_views_.OnMousePressed(NSZeroRect, index);
 }
 
+void LocationBarViewMac::SetStarred(bool starred) {
+  star_icon_view_.SetStarred(starred);
+  [field_ updateCursorAndToolTipRects];
+  [field_ resetFieldEditorFrameIfNeeded];
+}
+
 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]);
     }
   }
   return tab_button_image_;
 }
 
 void LocationBarViewMac::SetIcon(int resource_id) {
   DCHECK(resource_id != 0);
 
   // The icon is always visible except when there is a keyword hint.
   if (!edit_view_->model()->keyword().empty() &&
       !edit_view_->model()->is_keyword_hint()) {
     location_icon_view_.SetVisible(false);
   } else {
-    location_icon_view_.SetImage(
-        ResourceBundle::GetSharedInstance().GetNSImageNamed(resource_id));
+    location_icon_view_.SetIcon(resource_id);
     location_icon_view_.SetVisible(true);
     SetSecurityLabel();
   }
   [field_ resetFieldEditorFrameIfNeeded];
 }
 
 void LocationBarViewMac::SetSecurityLabel() {
   std::wstring security_info_text(toolbar_model_->GetSecurityInfoText());
   if (security_info_text.empty()) {
     security_label_view_.SetLabel(nil, nil, nil);
@@ skipping 51 matching lines @@
         toolbar_model_->input_in_progress() ? NULL : tab_contents);
   }
 }
 
 // LocationBarImageView---------------------------------------------------------
 
 void LocationBarViewMac::LocationBarImageView::SetImage(NSImage* image) {
   image_.reset([image retain]);
 }
 
-void LocationBarViewMac::LocationBarImageView::SetImage(SkBitmap* image) {
-  SetImage(gfx::SkBitmapToNSImage(*image));
+void LocationBarViewMac::LocationBarImageView::SetIcon(int resource_id) {
+  ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+  SetImage(rb.GetNSImageNamed(resource_id));
 }
 
 void LocationBarViewMac::LocationBarImageView::SetLabel(NSString* text,
                                                         NSFont* baseFont,
                                                         NSColor* color) {
   // Create an attributed string for the label, if a label was given.
   label_.reset();
   if (text) {
     DCHECK(color);
     DCHECK(baseFont);
@@ skipping 37 matching lines @@
 void LocationBarViewMac::LocationIconView::OnMousePressed(NSRect bounds) {
   TabContents* tab = owner_->GetTabContents();
   NavigationEntry* nav_entry = tab->controller().GetActiveEntry();
   if (!nav_entry) {
     NOTREACHED();
     return;
   }
   tab->ShowPageInfo(nav_entry->url(), nav_entry->ssl(), true);
 }
 
+// StarIconView-----------------------------------------------------------------
+
+LocationBarViewMac::StarIconView::StarIconView(CommandUpdater* command_updater)
+    : command_updater_(command_updater) {
+  SetVisible(true);
+  SetStarred(false);
+}
+
+void LocationBarViewMac::StarIconView::SetStarred(bool starred) {
+  if (starred) {
+    SetIcon(IDR_STARRED_NOBORDER_CENTER);
+    tooltip_.reset(
+        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STARRED) retain]);
+  } else {
+    SetIcon(IDR_STAR_NOBORDER_CENTER);
+    tooltip_.reset(
+        [l10n_util::GetNSStringWithFixup(IDS_TOOLTIP_STAR) retain]);
+  }
+}
+
+void LocationBarViewMac::StarIconView::OnMousePressed(NSRect bounds) {
+  command_updater_->ExecuteCommand(IDC_BOOKMARK_PAGE);
+}
+
+const 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 233 matching lines @@
 }
 
 const NSString* LocationBarViewMac::ContentSettingImageView::GetToolTip() {
   return tooltip_.get();
 }
 
 void LocationBarViewMac::ContentSettingImageView::UpdateFromTabContents(
     const TabContents* tab_contents) {
   content_setting_image_model_->UpdateFromTabContents(tab_contents);
   if (content_setting_image_model_->is_visible()) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     // TODO(thakis): We should use pdfs for these icons on OSX.
     // http://crbug.com/35847
-    SetImage(rb.GetNSImageNamed(content_setting_image_model_->get_icon()));
+    SetIcon(content_setting_image_model_->get_icon());
     SetToolTip(base::SysUTF8ToNSString(
         content_setting_image_model_->get_tooltip()));
     SetVisible(true);
   } else {
     SetVisible(false);
   }
 }
 
 void LocationBarViewMac::ContentSettingImageView::SetToolTip(NSString* tooltip)
 {
@@ skipping 62 matching lines @@
       ++result;
   }
   return result;
 }
 
 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
                                                             size_t index) {
   ViewAt(index)->OnMousePressed(iconFrame);
 }