Index: chrome/browser/ui/website_settings/chooser_bubble_controller.cc |
diff --git a/chrome/browser/ui/website_settings/chooser_bubble_controller.cc b/chrome/browser/ui/website_settings/chooser_bubble_controller.cc |
index 9fc123b05fc994a51a0c74d61f426c1b73867871..b3c6fd43fb7da3b2824f83cf111cdec192d5022f 100644 |
--- a/chrome/browser/ui/website_settings/chooser_bubble_controller.cc |
+++ b/chrome/browser/ui/website_settings/chooser_bubble_controller.cc |
@@ -5,29 +5,18 @@ |
#include "chrome/browser/ui/website_settings/chooser_bubble_controller.h" |
#include "chrome/browser/net/referrer.h" |
+#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_finder.h" |
-#include "content/public/browser/render_frame_host.h" |
#include "content/public/browser/web_contents.h" |
ChooserBubbleController::ChooserBubbleController( |
content::RenderFrameHost* owner) |
- : browser_(chrome::FindBrowserWithWebContents( |
- content::WebContents::FromRenderFrameHost(owner))), |
- owning_frame_(owner) {} |
+ : ChooserController(owner), |
+ browser_(chrome::FindBrowserWithWebContents( |
+ content::WebContents::FromRenderFrameHost(owner))) {} |
ChooserBubbleController::~ChooserBubbleController() {} |
-url::Origin ChooserBubbleController::GetOrigin() const { |
- return const_cast<content::RenderFrameHost*>(owning_frame_) |
- ->GetLastCommittedOrigin(); |
-} |
- |
-void ChooserBubbleController::OpenHelpCenterUrl() const { |
- browser_->OpenURL(content::OpenURLParams( |
- GetHelpCenterUrl(), content::Referrer(), NEW_FOREGROUND_TAB, |
- ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); |
-} |
- |
std::string ChooserBubbleController::GetName() const { |
return "ChooserBubble"; |
} |
@@ -35,3 +24,9 @@ std::string ChooserBubbleController::GetName() const { |
const content::RenderFrameHost* ChooserBubbleController::OwningFrame() const { |
return owning_frame_; |
} |
+ |
+void ChooserBubbleController::OpenHelpCenterUrl() const { |
+ browser_->OpenURL(content::OpenURLParams( |
+ GetHelpCenterUrl(), content::Referrer(), NEW_FOREGROUND_TAB, |
+ ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */)); |
+} |