Clean up NOTIFICATION_EXTENSION_PAGE_ACTION_[ COUNT | VISIBILITY ]_CHANGED

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 127 matching lines @@
       weak_ptr_factory_(this) {
   for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     DCHECK_EQ(i, content_setting_decorations_.size());
     ContentSettingsType type = static_cast<ContentSettingsType>(i);
     content_setting_decorations_.push_back(
         new ContentSettingDecoration(type, this, profile));
   }
 
   registrar_.Add(
       this,
-      extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
+      extensions::NOTIFICATION_EXTENSION_PAGE_ACTIONS_UPDATED,
       content::NotificationService::AllSources());
   content::Source<Profile> profile_source = content::Source<Profile>(profile);
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
                  profile_source);
   registrar_.Add(this,
                  extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
                  profile_source);
 
   edit_bookmarks_enabled_.Init(
@@ skipping 59 matching lines @@
 
 void LocationBarViewMac::UpdateManagePasswordsIconAndBubble() {
   WebContents* web_contents = GetWebContents();
   if (!web_contents)
     return;
   ManagePasswordsUIController::FromWebContents(web_contents)
       ->UpdateIconAndBubbleState(manage_passwords_decoration_->icon());
 }
 
 void LocationBarViewMac::UpdatePageActions() {
-  size_t count_before = page_action_decorations_.size();
   RefreshPageActionDecorations();
   Layout();
-  if (page_action_decorations_.size() != count_before) {
-    content::NotificationService::current()->Notify(
-        extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
-        content::Source<LocationBar>(this),
-        content::NotificationService::NoDetails());
-  }
 }
 
 void LocationBarViewMac::InvalidatePageActions() {
-  size_t count_before = page_action_decorations_.size();
   DeletePageActionDecorations();
   Layout();
-  if (page_action_decorations_.size() != count_before) {
-    content::NotificationService::current()->Notify(
-        extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED,
-        content::Source<LocationBar>(this),
-        content::NotificationService::NoDetails());
-  }
 }
 
 void LocationBarViewMac::UpdateOpenPDFInReaderPrompt() {
   // Not implemented on Mac.
 }
 
 void LocationBarViewMac::UpdateGeneratedCreditCardView() {
   generated_credit_card_decoration_->Update();
 }
 
@@ skipping 369 matching lines @@
         GetOmniboxIcon(template_url->GetExtensionId()).AsNSImage();
   }
 
   return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH);
 }
 
 void LocationBarViewMac::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   switch (type) {
-    case extensions::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
-      WebContents* contents = GetWebContents();
-      if (content::Details<WebContents>(contents) != details)
+    case extensions::NOTIFICATION_EXTENSION_PAGE_ACTIONS_UPDATED: {
+      if (content::Source<WebContents>(source).ptr() != GetWebContents())
         return;
 
       [field_ updateMouseTracking];
       [field_ setNeedsDisplay:YES];
       break;
     }
 
     case extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED:
     case extensions::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED:
       Update(NULL);
@@ skipping 153 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;
 }