Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/net/referrer.h" | |
| 6 #include "chrome/browser/profiles/profile_manager.h" | |
| 5 #include "chrome/browser/ui/browser_finder.h" | 7 #include "chrome/browser/ui/browser_finder.h" |
| 8 #include "chrome/browser/ui/host_desktop.h" | |
| 9 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | |
| 6 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" | 10 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" |
| 7 #include "content/public/browser/web_contents.h" | 11 #include "content/public/browser/web_contents.h" |
| 8 | 12 |
| 13 namespace { | |
| 14 | |
| 15 Browser* GetBrowser() { | |
| 16 chrome::ScopedTabbedBrowserDisplayer browser_displayer( | |
| 17 ProfileManager::GetActiveUserProfile()); | |
| 18 DCHECK(browser_displayer.browser()); | |
| 19 return browser_displayer.browser(); | |
| 20 } | |
| 21 | |
| 22 void OpenURL(const GURL& url) { | |
| 23 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.
| |
| 24 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.
| |
| 25 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.
| |
| 26 } | |
| 27 | |
| 28 } // namespace | |
| 29 | |
| 9 ChooserBubbleDelegate::ChooserBubbleDelegate(content::RenderFrameHost* owner) | 30 ChooserBubbleDelegate::ChooserBubbleDelegate(content::RenderFrameHost* owner) |
| 10 : browser_(chrome::FindBrowserWithWebContents( | 31 : browser_(chrome::FindBrowserWithWebContents( |
| 11 content::WebContents::FromRenderFrameHost(owner))), | 32 content::WebContents::FromRenderFrameHost(owner))), |
| 12 owning_frame_(owner) {} | 33 owning_frame_(owner) {} |
| 13 | 34 |
| 14 ChooserBubbleDelegate::~ChooserBubbleDelegate() {} | 35 ChooserBubbleDelegate::~ChooserBubbleDelegate() {} |
| 15 | 36 |
| 37 void ChooserBubbleDelegate::OpenHelpCenterURL() const { | |
| 38 OpenURL(GetHelpCenterURL()); | |
| 39 } | |
| 40 | |
| 16 std::string ChooserBubbleDelegate::GetName() const { | 41 std::string ChooserBubbleDelegate::GetName() const { |
| 17 return "ChooserBubble"; | 42 return "ChooserBubble"; |
| 18 } | 43 } |
| 19 | 44 |
| 20 const content::RenderFrameHost* ChooserBubbleDelegate::OwningFrame() const { | 45 const content::RenderFrameHost* ChooserBubbleDelegate::OwningFrame() const { |
| 21 return owning_frame_; | 46 return owning_frame_; |
| 22 } | 47 } |
| OLD | NEW |