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 190 matching lines @@
 
 void LocationBarViewMac::UpdatePageActions() {
   RefreshPageActionDecorations();
   Layout();
 
   [field_ updateMouseTracking];
   [field_ setNeedsDisplay:YES];
 }
 
 void LocationBarViewMac::InvalidatePageActions() {
-  DeletePageActionDecorations();
+  DeletePageActionsAndDecorations();
   Layout();
 }
 
 void LocationBarViewMac::UpdateBookmarkStarVisibility() {
   star_decoration_->SetVisible(IsStarEnabled());
 }
 
 bool LocationBarViewMac::ShowPageActionPopup(
     const extensions::Extension* extension, bool grant_active_tab) {
   for (ScopedVector<PageActionDecoration>::iterator iter =
@@ skipping 421 matching lines @@
   for (size_t i = 0; i < page_action_decorations_.size(); ++i) {
     if (page_action_decorations_[i]->GetPageAction() == page_action)
       return page_action_decorations_[i];
   }
   // If |page_action| is the browser action of an extension, no element in
   // |page_action_decorations_| will match.
   NOTREACHED();
   return NULL;
 }
 
-void LocationBarViewMac::DeletePageActionDecorations() {
+void LocationBarViewMac::DeletePageActionsAndDecorations() {
   // TODO(shess): Deleting these decorations could result in the cell
   // refering to them before things are laid out again.  Meanwhile, at
   // least fail safe.
   [[field_ cell] clearDecorations];
 
   page_action_decorations_.clear();
+  page_actions_.clear();
 }
 
 void LocationBarViewMac::OnEditBookmarksEnabledChanged() {
   UpdateBookmarkStarVisibility();
   OnChanged();
 }
 
 void LocationBarViewMac::RefreshPageActionDecorations() {
   if (!IsEditable()) {
-    DeletePageActionDecorations();
+    DeletePageActionsAndDecorations();
     return;
   }
 
   WebContents* web_contents = GetWebContents();
   if (!web_contents) {
-    DeletePageActionDecorations();  // Necessary?
+    DeletePageActionsAndDecorations();  // Necessary?
     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);
-    DeletePageActionDecorations();
+    page_action_decorations_.clear();

[danduong, 2014/12/20 03:21:24]

do you have to call [[field_ cell] clearDecorations] here?

[erikchen, 2014/12/22 20:39:43]

Yes, you're right.

     for (size_t i = 0; i < page_actions_.size(); ++i) {
       page_action_decorations_.push_back(
           new PageActionDecoration(this, browser_, page_actions_[i]));
     }
 
     // Move rightmost extensions to the start.
     std::stable_partition(page_action_decorations_.begin(),
                           page_action_decorations_.end(),
                           PageActionHasBookmarkManagerPrivate);
   }
@@ skipping 61 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;
 }