Fix a crash in PageActionImageView when extensions are reloaded due to incognito settings changing.

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

 // Copyright (c) 2011 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/page_action_image_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_resource.h"
+#include "content/browser/notification_service_impl.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/menu_model_adapter.h"
 #include "views/controls/menu/menu_runner.h"
 
 PageActionImageView::PageActionImageView(LocationBarView* owner,
                                          ExtensionAction* page_action)
     : owner_(owner),
       page_action_(page_action),
       ALLOW_THIS_IN_INITIALIZER_LIST(tracker_(this)),
@@ skipping 12 matching lines @@
     icon_paths.push_back(page_action_->default_icon_path());
 
   for (std::vector<std::string>::iterator iter = icon_paths.begin();
        iter != icon_paths.end(); ++iter) {
     tracker_.LoadImage(extension, extension->GetResource(*iter),
                        gfx::Size(Extension::kPageActionIconMaxSize,
                                  Extension::kPageActionIconMaxSize),
                        ImageLoadingTracker::DONT_CACHE);
   }
 
+  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
+                 content::Source<Profile>(
+                     owner_->browser()->profile()->GetOriginalProfile()));
+
   set_accessibility_focusable(true);
 }
 
 PageActionImageView::~PageActionImageView() {
   if (popup_)
     HidePopup();
 }
 
 void PageActionImageView::ExecuteAction(int button,
                                         bool inspect_with_devtools) {
@@ skipping 158 matching lines @@
         icon = iter->second;
     }
   }
   if (!icon.isNull())
     SetImage(&icon);
 
   SetVisible(true);
 }
 
 void PageActionImageView::InspectPopup(ExtensionAction* action) {
-  ExecuteAction(1,  // left-click
-                true);  // inspect_with_devtools
+  ExecuteAction(1,      // Left-click.
+                true);  // |inspect_with_devtools|.
 }
 
 void PageActionImageView::ExtensionPopupIsClosing(ExtensionPopup* popup) {
   DCHECK_EQ(popup_, popup);
   // ExtensionPopup is ref-counted, so we don't need to delete it.
   popup_ = NULL;
 }
 
+void PageActionImageView::Observe(int type,
+                                  const content::NotificationSource& source,
+                                  const content::NotificationDetails& details) {
+  DCHECK(type == chrome::NOTIFICATION_EXTENSION_UNLOADED);

[Aaron Boodman, 2011/10/27 16:57:35]

Can use _EQ.

+  const Extension* unloaded_extension =
+      content::Details<UnloadedExtensionInfo>(details)->extension;
+  if (page_action_ == unloaded_extension ->page_action())
+    owner_->UpdatePageActions();
+}
+
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->Close();
 }