Index: chrome/browser/chooser_controller/chooser_controller.cc |
diff --git a/chrome/browser/chooser_controller/chooser_controller.cc b/chrome/browser/chooser_controller/chooser_controller.cc |
index 44340322c027e82fb39bceaf2db6263e8deff5ca..d6608b4436b8cacb38d7352e79000885678d61c5 100644 |
--- a/chrome/browser/chooser_controller/chooser_controller.cc |
+++ b/chrome/browser/chooser_controller/chooser_controller.cc |
@@ -16,40 +16,38 @@ |
ChooserController::ChooserController(content::RenderFrameHost* owner, |
int title_string_id_origin, |
- int title_string_id_extension) |
- : owning_frame_(owner), |
- title_string_id_origin_(title_string_id_origin), |
- title_string_id_extension_(title_string_id_extension) {} |
+ int title_string_id_extension) { |
+ if (owner) { |
+ url::Origin origin = owner->GetLastCommittedOrigin(); |
-ChooserController::~ChooserController() {} |
- |
-base::string16 ChooserController::GetTitle() const { |
- if (!owning_frame_) |
- return base::string16(); |
- |
- url::Origin origin = owning_frame_->GetLastCommittedOrigin(); |
- |
- if (origin.scheme() == extensions::kExtensionScheme) { |
- content::WebContents* web_contents = |
- content::WebContents::FromRenderFrameHost(owning_frame_); |
- content::BrowserContext* browser_context = |
- web_contents->GetBrowserContext(); |
- extensions::ExtensionRegistry* extension_registry = |
- extensions::ExtensionRegistry::Get(browser_context); |
- if (extension_registry) { |
- const extensions::Extension* extension = |
- extension_registry->enabled_extensions().GetByID(origin.host()); |
- if (extension) { |
- return l10n_util::GetStringFUTF16(title_string_id_extension_, |
- base::UTF8ToUTF16(extension->name())); |
+ if (origin.scheme() == extensions::kExtensionScheme) { |
+ content::WebContents* web_contents = |
+ content::WebContents::FromRenderFrameHost(owner); |
+ content::BrowserContext* browser_context = |
+ web_contents->GetBrowserContext(); |
+ extensions::ExtensionRegistry* extension_registry = |
+ extensions::ExtensionRegistry::Get(browser_context); |
+ if (extension_registry) { |
+ const extensions::Extension* extension = |
+ extension_registry->enabled_extensions().GetByID(origin.host()); |
+ if (extension) { |
+ title_ = l10n_util::GetStringFUTF16( |
+ title_string_id_extension, base::UTF8ToUTF16(extension->name())); |
+ } |
} |
+ } else { |
+ title_ = l10n_util::GetStringFUTF16( |
msw
2017/03/13 23:48:51
We should also assign this value to |title_| if th
Reilly Grant (use Gerrit)
2017/03/14 20:44:10
Done.
|
+ title_string_id_origin, |
+ url_formatter::FormatOriginForSecurityDisplay( |
+ origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC)); |
} |
} |
+} |
+ |
+ChooserController::~ChooserController() {} |
- return l10n_util::GetStringFUTF16( |
- title_string_id_origin_, |
- url_formatter::FormatOriginForSecurityDisplay( |
- origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC)); |
+base::string16 ChooserController::GetTitle() const { |
+ return title_; |
} |
bool ChooserController::ShouldShowIconBeforeText() const { |