Fix disappearing page actions bug.

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

 // Copyright 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/message_loop.h"
 #include "base/prefs/pref_service.h"
@@ skipping 189 matching lines @@
 }
 
 void LocationBarViewMac::UpdatePageActions() {
   RefreshPageActionDecorations();
   Layout();
 
   [field_ updateMouseTracking];
   [field_ setNeedsDisplay:YES];
 }
 
-void LocationBarViewMac::InvalidatePageActions() {
-  DeletePageActionDecorations();
-  Layout();
-}
-
 void LocationBarViewMac::UpdateBookmarkStarVisibility() {
   star_decoration_->SetVisible(IsStarEnabled());
 }
 
 bool LocationBarViewMac::ShowPageActionPopup(
     const extensions::Extension* extension, bool grant_active_tab) {
   for (ScopedVector<PageActionDecoration>::iterator iter =
            page_action_decorations_.begin();
        iter != page_action_decorations_.end(); ++iter) {
     if ((*iter)->GetExtension() == extension)
@@ skipping 440 matching lines @@
 }
 
 void LocationBarViewMac::RefreshPageActionDecorations() {
   if (!IsEditable()) {
     DeletePageActionDecorations();
     return;
   }
 
   WebContents* web_contents = GetWebContents();
   if (!web_contents) {
-    DeletePageActionDecorations();  // Necessary?
+    DeletePageActionDecorations();
     return;
   }
 
   std::vector<ExtensionAction*> new_page_actions =
       extensions::TabHelper::FromWebContents(web_contents)->
           location_bar_controller()->GetCurrentActions();
 
-  if (new_page_actions != page_actions_) {
-    page_actions_.swap(new_page_actions);
+  if (PageActionsDiffer(new_page_actions)) {
     DeletePageActionDecorations();
-    for (size_t i = 0; i < page_actions_.size(); ++i) {
+    for (size_t i = 0; i < new_page_actions.size(); ++i) {
       page_action_decorations_.push_back(
-          new PageActionDecoration(this, browser_, page_actions_[i]));
+          new PageActionDecoration(this, browser_, new_page_actions[i]));
     }
 
     // Move rightmost extensions to the start.
     std::stable_partition(page_action_decorations_.begin(),
                           page_action_decorations_.end(),
                           PageActionHasBookmarkManagerPrivate);
   }
 
   GURL url = GetToolbarModel()->GetURL();
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     page_action_decorations_[i]->UpdateVisibility(
         GetToolbarModel()->input_in_progress() ? NULL : web_contents);
   }
 }
 
+bool LocationBarViewMac::PageActionsDiffer(
+    const std::vector<ExtensionAction*>& page_actions) const {
+  if (page_action_decorations_.size() != page_actions.size())
+    return true;
+
+  for (size_t index = 0; index < page_actions.size(); ++index) {
+    PageActionDecoration* decoration = page_action_decorations_[index];
+    if (decoration->GetPageAction() != page_actions[index])
+      return true;
+  }
+
+  return false;
+}
+
 bool LocationBarViewMac::RefreshContentSettingsDecorations() {
   const bool input_in_progress = GetToolbarModel()->input_in_progress();
   WebContents* web_contents = input_in_progress ?
       NULL : browser_->tab_strip_model()->GetActiveWebContents();
   bool icons_updated = false;
   for (size_t i = 0; i < content_setting_decorations_.size(); ++i) {
     icons_updated |=
         content_setting_decorations_[i]->UpdateFromWebContents(web_contents);
   }
   return icons_updated;
@@ skipping 43 matching lines @@
 }
 
 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
   bool is_visible = !GetToolbarModel()->input_in_progress() &&
                     browser_->search_model()->voice_search_supported();
   if (mic_search_decoration_->IsVisible() == is_visible)
     return false;
   mic_search_decoration_->SetVisible(is_visible);
   return true;
 }