[Mac] Fix for Page Info Bubble

chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.h

 // Copyright 2014 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_UI_COCOA_PAGE_INFO_PAGE_INFO_BUBBLE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_PAGE_INFO_PAGE_INFO_BUBBLE_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
-#import "chrome/browser/ui/cocoa/omnibox_decoration_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/page_info/page_info_ui.h"
 #include "content/public/browser/web_contents_observer.h"
 
+class LocationBarDecoration;
 class PageInfoUIBridge;
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class X509Certificate;
 }
 
 namespace security_state {
 struct SecurityInfo;
 }  // namespace security_state
 
 // This NSWindowController subclass manages the InfoBubbleWindow and view that
 // are displayed when the user clicks the favicon or security lock icon.
-@interface PageInfoBubbleController : OmniboxDecorationBubbleController {
+@interface PageInfoBubbleController : BaseBubbleController {
  @private
   content::WebContents* webContents_;
 
   base::scoped_nsobject<NSView> contentView_;
 
   // The main content view for the Permissions tab.
   NSView* securitySectionView_;
 
   // Displays the short security summary for the page
   // (private/not private/etc.).
@@ skipping 42 matching lines @@
   // The link button for showing site settings.
   NSButton* siteSettingsButton_;
 
   // The UI translates user actions to specific events and forwards them to the
   // |presenter_|. The |presenter_| handles these events and updates the UI.
   std::unique_ptr<PageInfo> presenter_;
 
   // Bridge which implements the PageInfoUI interface and forwards
   // methods on to this class.
   std::unique_ptr<PageInfoUIBridge> bridge_;
+
+  // The omnibox icon the bubble is anchored to. The icon is set as active
+  // when the bubble is opened, and inactive when the bubble is closed.
+  // Usually we would override OmniboxDecorationBubbleController but the page
+  // info icon has a race condition where it might switch between
+  // LocationIconDecoration and SecurityStateBubbleDecoration.
+  LocationBarDecoration* decoration_;  // Weak.
 }
 
 // Designated initializer. The controller will release itself when the bubble
 // is closed. |parentWindow| cannot be nil. |webContents| may be nil for
 // testing purposes.
 - (id)initWithParentWindow:(NSWindow*)parentWindow
           pageInfoUIBridge:(PageInfoUIBridge*)bridge
                webContents:(content::WebContents*)webContents
                        url:(const GURL&)url;
 
@@ skipping 38 matching lines @@
   // The WebContents the bubble UI is attached to.
   content::WebContents* web_contents_;
 
   // The Cocoa controller for the bubble UI.
   PageInfoBubbleController* bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(PageInfoUIBridge);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_PAGE_INFO_PAGE_INFO_BUBBLE_CONTROLLER_H_