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

chrome/browser/cocoa/location_bar_view_mac.h

 // 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.
 
 #ifndef CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 #define CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_
 
 #include <string>
 #include <map>
 #include <vector>
@@ skipping 15 matching lines @@
 @class ExtensionPopupController;
 class Profile;
 class ToolbarModel;
 
 // A C++ bridge class that represents the location bar UI element to
 // the portable code.  Wires up an AutocompleteEditViewMac instance to
 // the location bar text field, which handles most of the work.
 
 class LocationBarViewMac : public AutocompleteEditController,
                            public LocationBar,
-                           public LocationBarTesting {
+                           public LocationBarTesting,
+                           public NotificationObserver {
  public:
   LocationBarViewMac(AutocompleteTextField* field,
                      const BubblePositioner* bubble_positioner,
                      CommandUpdater* command_updater,
                      ToolbarModel* toolbar_model,
                      Profile* profile);
   virtual ~LocationBarViewMac();
 
   // Overridden from LocationBar:
   virtual void ShowFirstRunBubble(bool use_OEM_bubble) { NOTIMPLEMENTED(); }
@@ skipping 42 matching lines @@
   // Internals of OnChanged(), pulled out for purposes of unit
   // testing.  Sets up |field| based on the parameters, which are
   // pulled from edit_view->model().
   static void OnChangedImpl(AutocompleteTextField* field,
                             const std::wstring& keyword,
                             const std::wstring& short_name,
                             const bool is_keyword_hint,
                             const bool show_search_hint,
                             NSImage* image);
 
+  // Overridden from NotificationObserver.
+  virtual void Observe(NotificationType type,
+                       const NotificationSource& source,
+                       const NotificationDetails& details);
+
   // Used to display a clickable icon in the location bar.
   class LocationBarImageView {
    public:
     explicit LocationBarImageView() : image_(nil),
                                       label_(nil),
                                       visible_(false) {}
     virtual ~LocationBarImageView() {}
 
     // Sets the image.
     void SetImage(NSImage* image);
@@ skipping 209 matching lines @@
   Profile* profile_;
 
   ToolbarModel* toolbar_model_;  // Weak, owned by Browser.
 
   // Image used in drawing keyword hint.
   scoped_nsobject<NSImage> tab_button_image_;
 
   // The transition type to use for the navigation.
   PageTransition::Type transition_;
 
+  // Used to register for notifications received by NotificationObserver.
+  NotificationRegistrar registrar_;
+
   DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);
 };
 
 #endif  // CHROME_BROWSER_COCOA_LOCATION_BAR_VIEW_MAC_H_