[Mac] Fix for the security chip

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_utils.h"
 #import "chrome/browser/ui/cocoa/chrome_style.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h"
 #import "chrome/browser/ui/cocoa/hover_close_button.h"
 #import "chrome/browser/ui/cocoa/info_bubble_view.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
+#import "chrome/browser/ui/cocoa/location_bar/location_bar_decoration.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #include "chrome/browser/ui/cocoa/website_settings/permission_selector_button.h"
 #include "chrome/browser/ui/cocoa/website_settings/split_block_button.h"
 #include "chrome/browser/ui/cocoa/website_settings/website_settings_utils_cocoa.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/website_settings/permission_menu_model.h"
 #include "chrome/browser/ui/website_settings/permission_prompt.h"
@@ skipping 191 matching lines @@
     bridge_ = bridge;
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(parentWindowDidMove:)
                    name:NSWindowDidMoveNotification
                  object:[self getExpectedParentWindow]];
   }
   return self;
 }
 
-- (LocationBarDecoration*)decorationForBubble {
-  if (![self hasVisibleLocationBar])
-    return nullptr;
-
-  LocationBarViewMac* location_bar =
-      [[self.parentWindow windowController] locationBarBridge];
-  return location_bar->GetPageInfoDecoration();
-}
-
 + (NSPoint)getAnchorPointForBrowser:(Browser*)browser {
   NSPoint anchor;
   NSWindow* parentWindow = browser->window()->GetNativeWindow();
   if ([PermissionBubbleController hasVisibleLocationBarForBrowser:browser]) {
     LocationBarViewMac* location_bar =
         [[parentWindow windowController] locationBarBridge];
     anchor = location_bar->GetPageInfoBubblePoint();
   } else {
     // Position the bubble on the left of the screen if there is no page info
     // button to point at.
@@ skipping 29 matching lines @@
 
 - (void)windowWillClose:(NSNotification*)notification {
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidMoveNotification
               object:nil];
   bridge_->OnBubbleClosing();
   [super windowWillClose:notification];
 }
 
+- (void)showWindow:(id)sender {

[Robert Sesek, 2017/03/15 17:35:09]

What about the ![self hasVisibileLocationBar] check above?

[spqchan, 2017/03/15 21:18:47]

Whoops, thanks for catching that!

+  decoration_ = [[self.parentWindow windowController] locationBarBridge]
+                    ->GetPageInfoDecoration();
+  decoration_->SetActive(true);
+  [super showWindow:sender];
+}
+
+- (void)close {

[Robert Sesek, 2017/03/15 17:35:09]

What's the destruction order of the bubble w.r.t. the BWC? Can the decoration
(assuming weak pointer in this class) be deleted before this runs?

[spqchan, 2017/03/15 21:18:47]

The bubble will close before the decoration and the BWC gets dealloc

+  if (decoration_) {
+    decoration_->SetActive(false);
+    decoration_ = nullptr;
+  }
+
+  [super close];
+}
+
 - (void)parentWindowWillToggleFullScreen:(NSNotification*)notification {
   // Override the base class implementation, which would have closed the bubble.
 }
 
 - (void)parentWindowDidResize:(NSNotification*)notification {
   // Override the base class implementation, which sets the anchor point. But
   // it's not necessary since BrowserWindowController will notify the
   // PermissionRequestManager to update the anchor position on a resize.
 }
 
@@ skipping 343 matching lines @@
 }
 
 - (IBAction)cancel:(id)sender {
   // This is triggered by ESC when the bubble has focus.
   if (delegate_)
     delegate_->Closing();
   [super cancel:sender];
 }
 
 @end  // implementation PermissionBubbleController