When using action box on Mac, hide star when page is not bookmarked.

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

 // 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.
 
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 232 matching lines @@
   // TODO(gbillock): Implement web intents tool for mac
 }
 
 void LocationBarViewMac::SaveStateToContents(WebContents* contents) {
   // TODO(shess): Why SaveStateToContents vs SaveStateToTab?
   omnibox_view_->SaveStateToTab(contents);
 }
 
 void LocationBarViewMac::Update(const WebContents* contents,
                                 bool should_restore_state) {
-  bool star_enabled = IsStarEnabled();
-  command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
-  star_decoration_->SetVisible(star_enabled);
+  command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, IsStarEnabled());
+  UpdateStarDecorationVisibility();
   UpdateChromeToMobileEnabled();
   UpdateZoomDecoration();
   RefreshPageActionDecorations();
   RefreshContentSettingsDecorations();
   // OmniboxView restores state if the tab is non-NULL.
   omnibox_view_->Update(should_restore_state ? contents : NULL);
   OnChanged();
 }
 
 void LocationBarViewMac::OnAutocompleteAccept(
@@ skipping 205 matching lines @@
 }
 
 void LocationBarViewMac::TestPageActionPressed(size_t index) {
   DCHECK_LT(index, page_action_decorations_.size());
   if (index < page_action_decorations_.size())
     page_action_decorations_[index]->OnMousePressed(NSZeroRect);
 }
 
 void LocationBarViewMac::SetEditable(bool editable) {
   [field_ setEditable:editable ? YES : NO];
-  star_decoration_->SetVisible(IsStarEnabled());
+  UpdateStarDecorationVisibility();
   UpdateChromeToMobileEnabled();
   UpdateZoomDecoration();
   UpdatePageActions();
   Layout();
 }
 
 bool LocationBarViewMac::IsEditable() {
   return [field_ isEditable] ? true : false;
 }
 
 void LocationBarViewMac::OnDecorationsChanged() {
   // TODO(shess): The field-editor frame and cursor rects should not
   // change, here.
   [field_ updateCursorAndToolTipRects];
   [field_ resetFieldEditorFrameIfNeeded];
   [field_ setNeedsDisplay:YES];
 }
 
 void LocationBarViewMac::SetStarred(bool starred) {
   star_decoration_->SetStarred(starred);
+  UpdateStarDecorationVisibility();
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::SetChromeToMobileDecorationLit(bool lit) {
   chrome_to_mobile_decoration_->SetLit(lit);
   OnDecorationsChanged();
 }
 
 void LocationBarViewMac::ZoomChangedForActiveTab(bool can_show_bubble) {
   UpdateZoomDecoration();
@@ skipping 65 matching lines @@
 
     case chrome::NOTIFICATION_EXTENSION_LOCATION_BAR_UPDATED: {
       // Only update if the updated action box was for the active tab contents.
       TabContents* target_tab = content::Details<TabContents>(details).ptr();
       if (target_tab == GetTabContents())
         UpdatePageActions();
       break;
     }
 
     case chrome::NOTIFICATION_PREF_CHANGED:
-      star_decoration_->SetVisible(IsStarEnabled());
+      UpdateStarDecorationVisibility();
       UpdateChromeToMobileEnabled();
       OnChanged();
       break;
 
     default:
       NOTREACHED() << "Unexpected notification";
       break;
   }
 }
 
@@ skipping 162 matching lines @@
   command_updater_->UpdateCommandEnabled(IDC_CHROME_TO_MOBILE_PAGE, enabled);
 }
 
 void LocationBarViewMac::UpdateZoomDecoration() {
   TabContents* tab_contents = GetTabContents();
   if (!tab_contents)
     return;
 
   zoom_decoration_->Update(tab_contents->zoom_controller());
 }
+
+void LocationBarViewMac::UpdateStarDecorationVisibility() {
+  bool action_box_enabled =
+      CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableActionBox);
+  // If the action box is enabled, only show the star if it's lit.
+  star_decoration_->SetVisible(IsStarEnabled() &&
+      (star_decoration_->starred() || !action_box_enabled));

[Scott Hess - ex-Googler, 2012/08/27 19:47:31]

I think this condition is needlessly complicated.  I think better would be
something like:
  bool visible = IsStarEnabled();
  if (action_box_enabled && !starred())
    visible = false;
though I might not understand the entire truth table for the existing condition
:-).

[beaudoin, 2012/08/27 21:25:48]

Good job on that truth table! This indeed simplifies it! :)

Done.

+}