Clean up NOTIFICATION_EXTENSION_PAGE_ACTION_[ COUNT | VISIBILITY ]_CHANGED

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/command_line.h"
@@ skipping 1128 matching lines @@
        i != page_action_views_.end(); ++i)
     RemoveChildView(*i);
   STLDeleteElements(&page_action_views_);
 }
 
 bool LocationBarView::RefreshPageActionViews() {
   if (is_popup_mode_)
     return false;
 
   bool changed = false;
-
-  // Remember the previous visibility of the page actions so that we can
-  // notify when this changes.
-  std::map<ExtensionAction*, bool> old_visibility;
-  for (PageActionViews::const_iterator i(page_action_views_.begin());
-       i != page_action_views_.end(); ++i) {
-    old_visibility[(*i)->image_view()->extension_action()] = (*i)->visible();
-  }
-
   PageActions new_page_actions;
 
   WebContents* web_contents = GetWebContents();
   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();
   }
@@ skipping 31 matching lines @@
     // reverse order so the logical order and visual order match for
     // accessibility purposes.
     for (PageActionViews::reverse_iterator i = page_action_views_.rbegin();
          i != page_action_views_.rend(); ++i)
       AddChildViewAt(*i, GetIndexOf(right_anchor));
   }
 
   if (!page_action_views_.empty() && web_contents) {
     for (PageActionViews::const_iterator i(page_action_views_.begin());
          i != page_action_views_.end(); ++i) {
+      bool old_visibility = (*i)->visible();
       (*i)->UpdateVisibility(
           GetToolbarModel()->input_in_progress() ? NULL : web_contents);
-
-      // Check if the visibility of the action changed and notify if it did.
-      ExtensionAction* action = (*i)->image_view()->extension_action();
-      if (old_visibility.find(action) == old_visibility.end() ||
-          old_visibility[action] != (*i)->visible()) {
-        changed = true;
-        content::NotificationService::current()->Notify(
-            extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
-            content::Source<ExtensionAction>(action),
-            content::Details<WebContents>(web_contents));
-      }
+      changed = old_visibility != (*i)->visible() ? true : changed;

[sky, 2014/08/20 15:45:30]

Tricky, but isn't:
changed = old_visibility != (*i)->visible()
the same thing? Although don't you want to return true if any element changed,
not just the last? So maybe:
changed |= old_visiblity != (*i)->visible();
?

[Devlin, 2014/08/20 15:54:49]

Right; changed = old_visibility != (*i)->visible() only accounts for the last
(and we want if there's any chnage).  But the changed |= ... will work, and is
perhaps slightly more elegant. :)  Done.

     }
   }
   return changed;
 }
 
 bool LocationBarView::RefreshZoomView() {
   DCHECK(zoom_view_);
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return false;
@@ skipping 139 matching lines @@
 }
 
 void LocationBarView::UpdateManagePasswordsIconAndBubble() {
   if (RefreshManagePasswordsIconView()) {
     Layout();
     SchedulePaint();
   }
 }
 
 void LocationBarView::UpdatePageActions() {
-  size_t count_before = page_action_views_.size();
-  bool changed = RefreshPageActionViews();
-  if (page_action_views_.size() != count_before) {
-    content::NotificationService::current()->Notify(
-        extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
-        content::Source<LocationBar>(this),
-        content::NotificationService::NoDetails());
-  }
-
-  if (changed) {
+  if (RefreshPageActionViews()) {  // Changed.
     Layout();
     SchedulePaint();
   }
 }
 
 void LocationBarView::InvalidatePageActions() {
-  size_t count_before = page_action_views_.size();
   DeletePageActionViews();
-  if (page_action_views_.size() != count_before) {
-    content::NotificationService::current()->Notify(
-        extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
-        content::Source<LocationBar>(this),
-        content::NotificationService::NoDetails());
-  }
 }
 
 void LocationBarView::UpdateOpenPDFInReaderPrompt() {
   open_pdf_in_reader_view_->Update(
       GetToolbarModel()->input_in_progress() ? NULL : GetWebContents());
   Layout();
   SchedulePaint();
 }
 
 void LocationBarView::UpdateGeneratedCreditCardView() {
@@ skipping 347 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();
   }
 }