[Mac] Fix for Page Info Bubble

chrome/browser/ui/cocoa/page_info/page_info_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/page_info/page_info_bubble_controller.h"
 
 #import <AppKit/AppKit.h>
 
 #include <cmath>
 
 #include "base/i18n/rtl.h"
 #include "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/certificate_viewer.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.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"
 #import "chrome/browser/ui/cocoa/page_info/permission_selector_button.h"
 #include "chrome/browser/ui/page_info/permission_menu_model.h"
 #import "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
@@ skipping 202 matching lines @@
     } else {
       [self initializeContents];
     }
 
     bridge_.reset(bridge);
     bridge_->set_bubble_controller(self);
   }
   return self;
 }
 
-- (LocationBarDecoration*)decorationForBubble {
+- (void)showWindow:(id)sender {
   BrowserWindowController* controller = [[self parentWindow] windowController];
-  LocationBarViewMac* location_bar = [controller locationBarBridge];
-  return location_bar ? location_bar->GetPageInfoDecoration() : nullptr;
+  LocationBarViewMac* locationBar = [controller locationBarBridge];
+  if (locationBar) {
+    decoration_ = locationBar->GetPageInfoDecoration();
+    decoration_->SetActive(true);
+  }
+
+  [super showWindow:sender];
+}
+
+- (void)close {
+  if (decoration_) {
+    decoration_->SetActive(false);
+    decoration_ = nullptr;
+  }
+
+  [super close];
 }
 
 - (Profile*)profile {
   return Profile::FromBrowserContext(webContents_->GetBrowserContext());
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   if (presenter_.get())
     presenter_->OnUIClosing();
   presenter_.reset();
@@ skipping 970 matching lines @@
 void PageInfoUIBridge::SetCookieInfo(const CookieInfoList& cookie_info_list) {
   [bubble_controller_ setCookieInfo:cookie_info_list];
 }
 
 void PageInfoUIBridge::SetPermissionInfo(
     const PermissionInfoList& permission_info_list,
     ChosenObjectInfoList chosen_object_info_list) {
   [bubble_controller_ setPermissionInfo:permission_info_list
                        andChosenObjects:std::move(chosen_object_info_list)];
 }