Fix disappearing page actions bug.

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/i18n/rtl.h"
@@ skipping 1063 matching lines @@
   if (web_contents) {
     extensions::TabHelper* extensions_tab_helper =
         extensions::TabHelper::FromWebContents(web_contents);
     extensions::LocationBarController* controller =
         extensions_tab_helper->location_bar_controller();
     new_page_actions = controller->GetCurrentActions();
   }
 
   // On startup we sometimes haven't loaded any extensions. This makes sure
   // we catch up when the extensions (and any page actions) load.
-  if (page_actions_ != new_page_actions) {
+  if (PageActionsDiffer(new_page_actions)) {
     changed = true;
 
-    page_actions_.swap(new_page_actions);
-    DeletePageActionViews();  // Delete the old views (if any).
+    DeletePageActionViews();
 
     // Create the page action views.
-    for (PageActions::const_iterator i = page_actions_.begin();
-         i != page_actions_.end(); ++i) {
+    for (PageActions::const_iterator i = new_page_actions.begin();
+         i != new_page_actions.end(); ++i) {
       PageActionWithBadgeView* page_action_view = new PageActionWithBadgeView(
           delegate_->CreatePageActionImageView(this, *i));
       page_action_view->SetVisible(false);
       page_action_views_.push_back(page_action_view);
     }
 
     // Move rightmost extensions to the start.
     std::stable_partition(
         page_action_views_.begin(),
         page_action_views_.end(),
@@ skipping 18 matching lines @@
          i != page_action_views_.end(); ++i) {
       bool old_visibility = (*i)->visible();
       (*i)->UpdateVisibility(
           GetToolbarModel()->input_in_progress() ? NULL : web_contents);
       changed |= old_visibility != (*i)->visible();
     }
   }
   return changed;
 }
 
+bool LocationBarView::PageActionsDiffer(
+    const std::vector<ExtensionAction*>& page_actions) {
+  if (page_action_views_.size() != page_actions.size())
+    return true;
+
+  for (size_t index = 0; index < page_actions.size(); ++index) {
+    PageActionWithBadgeView* view = page_action_views_[index];
+    if (view->image_view()->extension_action() != page_actions[index])
+      return true;
+  }
+
+  return false;
+}
+
 bool LocationBarView::RefreshZoomView() {
   DCHECK(zoom_view_);
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return false;
   const bool was_visible = zoom_view_->visible();
   zoom_view_->Update(ui_zoom::ZoomController::FromWebContents(web_contents));
   if (!zoom_view_->visible())
     ZoomBubbleView::CloseBubble();
   return was_visible != zoom_view_->visible();
@@ skipping 145 matching lines @@
 }
 
 void LocationBarView::UpdatePageActions() {
   if (RefreshPageActionViews()) {  // Changed.
     Layout();
     SchedulePaint();
   }
 }
 
 void LocationBarView::InvalidatePageActions() {
-  DeletePageActionViews();
+  RefreshPageActionViews();

[Peter Kasting, 2014/12/23 00:20:05]

Why not just inline the contents of this method here, and then call this
function from the current callers of RefreshPageActionViews()?

Optionally, we could rename this "RefreshPageActions()" or something to make it
clearer what it does ("Invalidate" is somewhat vague).

[erikchen, 2014/12/23 00:55:03]

1. I renamed InvalidatePageActions->RefreshPageActions.
2. Upon further consideration, the implementation of this method was incorrect.
It should have performed a re-layout and re-paint, to match the implementation
of UpdatePageActions().

 }
 
 void LocationBarView::UpdateBookmarkStarVisibility() {
   if (star_view_) {
     star_view_->SetVisible(
         browser_defaults::bookmarks_enabled && !is_popup_mode_ &&
         !GetToolbarModel()->input_in_progress() &&
         edit_bookmarks_enabled_.GetValue() &&
         !IsBookmarkStarHiddenByExtension());
   }
@@ skipping 358 matching lines @@
 
 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
                                    const SearchModel::State& new_state) {
   const bool visible = !GetToolbarModel()->input_in_progress() &&
       new_state.voice_search_supported;
   if (mic_search_view_->visible() != visible) {
     mic_search_view_->SetVisible(visible);
     Layout();
   }
 }