Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(408)

Unified Diff: chrome/browser/chooser_controller/chooser_controller.cc

Issue 2126873003: Change WebBluetooth chooser title to "pair with" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@support_chrome_extension_chooser_title
Patch Set: address comment Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ce26370b9a1995422f2ea82cf3e9e5703717dadd..1a3da0a073d3150f7715a3b8baf7e66a663cc78e 100644
--- a/chrome/browser/chooser_controller/chooser_controller.cc
+++ b/chrome/browser/chooser_controller/chooser_controller.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/chooser_controller/chooser_controller.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/grit/generated_resources.h"
#include "components/url_formatter/elide_url.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
@@ -14,8 +13,12 @@
#include "ui/base/l10n/l10n_util.h"
#include "url/origin.h"
-ChooserController::ChooserController(content::RenderFrameHost* owner)
- : owning_frame_(owner) {}
+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) {}
ChooserController::~ChooserController() {}
@@ -36,15 +39,14 @@ base::string16 ChooserController::GetTitle() const {
const extensions::Extension* extension =
extension_registry->enabled_extensions().GetByID(origin.host());
if (extension) {
- return l10n_util::GetStringFUTF16(
- IDS_DEVICE_CHOOSER_PROMPT_EXTENSION_NAME,
- base::UTF8ToUTF16(extension->name()));
+ return l10n_util::GetStringFUTF16(title_string_id_extension_,
+ base::UTF8ToUTF16(extension->name()));
}
}
}
return l10n_util::GetStringFUTF16(
- IDS_DEVICE_CHOOSER_PROMPT_ORIGIN,
+ title_string_id_origin_,
url_formatter::FormatOriginForSecurityDisplay(
origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
}
« no previous file with comments | « chrome/browser/chooser_controller/chooser_controller.h ('k') | chrome/browser/chooser_controller/mock_chooser_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698