Fixes bug where a Page Action icon was not being properly displayed upon page...

chrome/browser/cocoa/location_bar_view_mac.mm

 // Copyright (c) 2009 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/cocoa/location_bar_view_mac.h"
 
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ skipping 81 matching lines @@
       field_(field),
       disposition_(CURRENT_TAB),
       security_image_view_(profile, toolbar_model),
       page_action_views_(new PageActionViewList(this, profile, toolbar_model)),
       profile_(profile),
       toolbar_model_(toolbar_model),
       transition_(PageTransition::TYPED) {
   AutocompleteTextFieldCell* cell = [field_ autocompleteTextFieldCell];
   [cell setSecurityImageView:&security_image_view_];
   [cell setPageActionViewList:page_action_views_];
+
+  registrar_.Add(this,
+      NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
+      NotificationService::AllSources());
 }
 
 LocationBarViewMac::~LocationBarViewMac() {
   // TODO(shess): Placeholder for omnibox changes.
   delete page_action_views_;
 }
 
 std::wstring LocationBarViewMac::GetInputString() const {
   return location_input_;
 }
@@ skipping 278 matching lines @@
       security_image_view_.SetVisible(false);
       break;
     default:
       NOTREACHED();
       security_image_view_.SetVisible(false);
       break;
   }
   [field_ resetFieldEditorFrameIfNeeded];
 }
 
+void LocationBarViewMac::Observe(NotificationType type,
+                                 const NotificationSource& source,
+                                 const NotificationDetails& details) {
+  switch (type.value) {
+    case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: {
+      TabContents* contents =
+          BrowserList::GetLastActive()->GetSelectedTabContents();
+      if (Details<TabContents>(contents) != details)
+        return;
+
+      [field_ setNeedsDisplay:YES];
+      break;
+    }
+    default:
+      NOTREACHED() << "Unexpected notification";
+      break;
+  }
+}
+
 // LocationBarImageView---------------------------------------------------------
 
 void LocationBarViewMac::LocationBarImageView::SetImage(NSImage* image) {
   image_.reset([image retain]);
 }
 
 void LocationBarViewMac::LocationBarImageView::SetImage(SkBitmap* image) {
   SetImage(gfx::SkBitmapToNSImage(*image));
 }
 
@@ skipping 312 matching lines @@
     if (views_[i]->IsVisible())
       ++result;
   }
   return result;
 }
 
 void LocationBarViewMac::PageActionViewList::OnMousePressed(NSRect iconFrame,
                                                             size_t index) {
   ViewAt(index)->OnMousePressed(iconFrame);
 }