Revert 57877 - Hide page actions and star, like we already do for content settings, when the user is editing the omnibox.

BUG=none
TEST=Typing in the omnibox should make all items on the right disappear, and make ctrl-d do nothing.
Review URL: http://codereview.chromium.org/3218002

TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/3264005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57894 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 20 deletions

diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
index 9bc4d1d..28f524b 100644
--- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm
@@ -33,7 +33,6 @@
 #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/defaults.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"
@@ -184,10 +183,6 @@ void LocationBarViewMac::SaveStateToContents(TabContents* contents) {
 
 void LocationBarViewMac::Update(const TabContents* contents,
                                 bool should_restore_state) {
-  bool star_enabled = browser_defaults::bookmarks_enabled &&
-      [field_ isEditable] && !toolbar_model_->input_in_progress();
-  command_updater_->UpdateCommandEnabled(IDC_BOOKMARK_PAGE, star_enabled);
-  star_decoration_->SetVisible(star_enabled);
   RefreshPageActionDecorations();
   RefreshContentSettingsDecorations();
   // AutocompleteEditView restores state if the tab is non-NULL.
@@ -376,8 +371,7 @@ void LocationBarViewMac::TestPageActionPressed(size_t index) {
 
 void LocationBarViewMac::SetEditable(bool editable) {
   [field_ setEditable:editable ? YES : NO];
-  star_decoration_->SetVisible(browser_defaults::bookmarks_enabled &&
-      editable && !toolbar_model_->input_in_progress());
+  star_decoration_->SetVisible(editable);
   UpdatePageActions();
   Layout();
 }
@@ -496,10 +490,8 @@ void LocationBarViewMac::RefreshPageActionDecorations() {
     return;
 
   GURL url = GURL(WideToUTF8(toolbar_model_->GetText()));
-  for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
-    page_action_decorations_[i]->UpdateVisibility(
-        toolbar_model_->input_in_progress() ? NULL : contents, url);
-  }
+  for (size_t i = 0; i < page_action_decorations_.size(); ++i)
+    page_action_decorations_[i]->UpdateVisibility(contents, url);
 }
 
 // TODO(shess): This function should over time grow to closely match
diff --git a/chrome/browser/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/cocoa/location_bar/page_action_decoration.mm
index 337cd2f..d306d87 100644
--- a/chrome/browser/cocoa/location_bar/page_action_decoration.mm
+++ b/chrome/browser/cocoa/location_bar/page_action_decoration.mm
@@ -121,15 +121,15 @@ void PageActionDecoration::OnImageLoaded(
   owner_->UpdatePageActions();
 }
 
-void PageActionDecoration::UpdateVisibility(TabContents* contents,
-                                            const GURL& url) {
+void PageActionDecoration::UpdateVisibility(
+    TabContents* contents, const GURL& url) {
   // Save this off so we can pass it back to the extension when the action gets
   // executed. See PageActionDecoration::OnMousePressed.
-  current_tab_id_ = contents ? ExtensionTabUtil::GetTabId(contents) : -1;
+  current_tab_id_ = ExtensionTabUtil::GetTabId(contents);
   current_url_ = url;
 
-  bool visible = contents &&
-      (preview_enabled_ || page_action_->GetIsVisible(current_tab_id_));
+  bool visible = preview_enabled_ ||
+                 page_action_->GetIsVisible(current_tab_id_);
   if (visible) {
     SetToolTip(page_action_->GetTitle(current_tab_id_));
 
@@ -146,15 +146,19 @@ void PageActionDecoration::UpdateVisibility(TabContents* contents,
     SkBitmap skia_icon = page_action_->GetIcon(current_tab_id_);
     if (skia_icon.isNull()) {
       int icon_index = page_action_->GetIconIndex(current_tab_id_);
-      std::string icon_path = (icon_index < 0) ?
-          page_action_->default_icon_path() :
-          page_action_->icon_paths()->at(icon_index);
+      std::string icon_path;
+      if (icon_index >= 0)
+        icon_path = page_action_->icon_paths()->at(icon_index);
+      else
+        icon_path = page_action_->default_icon_path();
+
       if (!icon_path.empty()) {
         PageActionMap::iterator iter = page_action_icons_.find(icon_path);
         if (iter != page_action_icons_.end())
           skia_icon = iter->second;
       }
     }
+
     if (!skia_icon.isNull()) {
       SetImage(gfx::SkBitmapToNSImage(skia_icon));
     } else if (!GetImage()) {
@@ -167,7 +171,6 @@ void PageActionDecoration::UpdateVisibility(TabContents* contents,
       SetImage([[NSImage alloc] initWithSize:default_size]);
     }
   }
-
   if (IsVisible() != visible) {
     SetVisible(visible);
     NotificationService::current()->Notify(