Index: chrome/browser/ui/website_settings/chooser_bubble_delegate.cc |
diff --git a/chrome/browser/ui/website_settings/chooser_bubble_delegate.cc b/chrome/browser/ui/website_settings/chooser_bubble_delegate.cc |
index 8b209753ca10767380b26589ac56f26ee0fc7d5c..9410f8315ba6be45e0bf6ca5a6ba23a74f179454 100644 |
--- a/chrome/browser/ui/website_settings/chooser_bubble_delegate.cc |
+++ b/chrome/browser/ui/website_settings/chooser_bubble_delegate.cc |
@@ -2,10 +2,31 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
+#include "chrome/browser/net/referrer.h" |
+#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/browser_finder.h" |
+#include "chrome/browser/ui/host_desktop.h" |
+#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
#include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" |
#include "content/public/browser/web_contents.h" |
+namespace { |
+ |
+Browser* GetBrowser() { |
+ chrome::ScopedTabbedBrowserDisplayer browser_displayer( |
+ ProfileManager::GetActiveUserProfile()); |
+ DCHECK(browser_displayer.browser()); |
+ return browser_displayer.browser(); |
+} |
+ |
+void OpenURL(const GURL& url) { |
+ GetBrowser()->OpenURL( |
Jeffrey Yasskin
2016/02/17 01:33:45
It seems wrong to conjure a browser window out of
palmer
2016/02/17 02:19:53
FWIW: The What Do These Mean? link in the (soon to
juncai
2016/02/17 22:40:40
Since ChooserBubbleDelegate has a Browser* member
Jeffrey Yasskin
2016/02/17 23:54:25
Awesome, thanks.
|
+ content::OpenURLParams(url, content::Referrer(), NEW_BACKGROUND_TAB, |
Jeffrey Yasskin
2016/02/17 01:33:45
I think we want this to be a FOREGROUND_TAB, to ma
juncai
2016/02/17 22:40:40
Done.
|
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, true)); |
Jeffrey Yasskin
2016/02/17 01:33:45
Always comment naked boolean arguments like this.
juncai
2016/02/17 22:40:40
Done.
|
+} |
+ |
+} // namespace |
+ |
ChooserBubbleDelegate::ChooserBubbleDelegate(content::RenderFrameHost* owner) |
: browser_(chrome::FindBrowserWithWebContents( |
content::WebContents::FromRenderFrameHost(owner))), |
@@ -13,6 +34,10 @@ ChooserBubbleDelegate::ChooserBubbleDelegate(content::RenderFrameHost* owner) |
ChooserBubbleDelegate::~ChooserBubbleDelegate() {} |
+void ChooserBubbleDelegate::OpenHelpCenterURL() const { |
+ OpenURL(GetHelpCenterURL()); |
+} |
+ |
std::string ChooserBubbleDelegate::GetName() const { |
return "ChooserBubble"; |
} |