issue2882533003_180001.diff.txt (patch set 6)

chrome/browser/ui/views/page_info/page_info_bubble_view.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/views/page_info/page_info_bubble_view.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 367 matching lines @@
   return ui::DIALOG_BUTTON_NONE;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PageInfoBubbleView
 ////////////////////////////////////////////////////////////////////////////////
 
 PageInfoBubbleView::~PageInfoBubbleView() {}
 
 // static
-void PageInfoBubbleView::ShowBubble(
+views::BubbleDialogDelegateView* PageInfoBubbleView::ShowBubble(
     views::View* anchor_view,
     const gfx::Rect& anchor_rect,
     Profile* profile,
     content::WebContents* web_contents,
     const GURL& url,
     const security_state::SecurityInfo& security_info) {
   gfx::NativeView parent_window =
       anchor_view ? nullptr : web_contents->GetNativeView();
   if (url.SchemeIs(content::kChromeUIScheme) ||
       url.SchemeIs(content::kChromeDevToolsScheme) ||
       url.SchemeIs(extensions::kExtensionScheme) ||
       url.SchemeIs(content::kViewSourceScheme)) {
     // Use the concrete type so that |SetAnchorRect| can be called as a friend.
     InternalPageInfoBubbleView* bubble =
         new InternalPageInfoBubbleView(anchor_view, parent_window, url);
     if (!anchor_view)
       bubble->SetAnchorRect(anchor_rect);
     bubble->GetWidget()->Show();
-    return;
+    return bubble;
   }
   PageInfoBubbleView* bubble = new PageInfoBubbleView(
       anchor_view, parent_window, profile, web_contents, url, security_info);
   if (!anchor_view)
     bubble->SetAnchorRect(anchor_rect);
   bubble->GetWidget()->Show();
+
+  return bubble;
 }
 
 // static
 PageInfoBubbleView::BubbleType PageInfoBubbleView::GetShownBubbleType() {
   return g_shown_bubble_type;
 }
 
 PageInfoBubbleView::PageInfoBubbleView(
     views::View* anchor_view,
     gfx::NativeView parent_window,
@@ skipping 361 matching lines @@
           PageInfo::PAGE_INFO_CONNECTION_HELP_OPENED);
       break;
     case STYLED_LABEL_RESET_CERTIFICATE_DECISIONS:
       presenter_->OnRevokeSSLErrorBypassButtonPressed();
       GetWidget()->Close();
       break;
     default:
       NOTREACHED();
   }
 }