Remove NOTIFICATION_EXTENSION_PAGE_ACTIONS_UPDATED

chrome/browser/extensions/api/extension_action/extension_action_api.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/extensions/api/extension_action/extension_action_api.h"
 
 #include "base/base64.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_function_registry.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/image_util.h"
@@ skipping 359 matching lines @@
   observers_.RemoveObserver(observer);
 }
 
 void ExtensionActionAPI::NotifyChange(ExtensionAction* extension_action,
                                       content::WebContents* web_contents,
                                       content::BrowserContext* context) {
   FOR_EACH_OBSERVER(
       Observer,
       observers_,
       OnExtensionActionUpdated(extension_action, web_contents, context));
+
+  if (extension_action->action_type() == ActionInfo::TYPE_PAGE)
+    NotifyPageActionsChanged(web_contents);
 }
 
 void ExtensionActionAPI::ClearAllValuesForTab(
     content::WebContents* web_contents) {
   DCHECK(web_contents);
   int tab_id = SessionTabHelper::IdForTab(web_contents);
   content::BrowserContext* browser_context = web_contents->GetBrowserContext();
   const ExtensionSet& enabled_extensions =
       ExtensionRegistry::Get(browser_context_)->enabled_extensions();
   ExtensionActionManager* action_manager =
       ExtensionActionManager::Get(browser_context_);
 
   for (ExtensionSet::const_iterator iter = enabled_extensions.begin();
        iter != enabled_extensions.end(); ++iter) {
     ExtensionAction* extension_action =
         action_manager->GetBrowserAction(*iter->get());
     if (!extension_action)

[Finnur, 2014/08/25 13:47:56]

If extension_action is non-null here, why call NotifyPageActionsChanged?

I guess this also applies to NotifyChange as well -- that's a generic
ExtensionAction function...

[Devlin, 2014/08/25 16:57:36]

Whoops!  Rebasing mistake (too many patches touching the same files...).

Moved the NotifyPageActionsChanged to only be in NotifyChange, since this also
calls that method.  Of course, NotifyPageActionsChanged() will be called iff
it's actually a page action that changed.

       extension_action = action_manager->GetPageAction(*iter->get());
     if (extension_action) {
       extension_action->ClearAllValuesForTab(tab_id);
       NotifyChange(extension_action, web_contents, browser_context);
     }
   }
+
+  NotifyPageActionsChanged(web_contents);
+}
+
+void ExtensionActionAPI::NotifyPageActionsChanged(
+    content::WebContents* web_contents) {
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
+  if (!browser)
+    return;
+  LocationBar* location_bar =
+      browser->window() ? browser->window()->GetLocationBar() : NULL;
+  if (!location_bar)
+    return;
+  location_bar->UpdatePageActions();
+
+  FOR_EACH_OBSERVER(Observer, observers_, OnPageActionsUpdated(web_contents));
 }
 
 void ExtensionActionAPI::Shutdown() {
   FOR_EACH_OBSERVER(Observer, observers_, OnExtensionActionAPIShuttingDown());
 }
 
 //
 // ExtensionActionStorageManager
 //
 
@@ skipping 390 matching lines @@
   if (host->extension_host_type() != VIEW_TYPE_EXTENSION_POPUP ||
       host->extension()->id() != extension_->id())
     return;
 
   SendResponse(true);
   response_sent_ = true;
   registrar_.RemoveAll();
 }
 
 }  // namespace extensions