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

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: rebase 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..e8cd78dd15e7095fa81b70bd155df27b407ee236 100644
--- a/chrome/browser/chooser_controller/chooser_controller.cc
+++ b/chrome/browser/chooser_controller/chooser_controller.cc
@@ -5,13 +5,11 @@
#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"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/constants.h"
-#include "ui/base/l10n/l10n_util.h"
#include "url/origin.h"
ChooserController::ChooserController(content::RenderFrameHost* owner)
@@ -19,9 +17,9 @@ ChooserController::ChooserController(content::RenderFrameHost* owner)
ChooserController::~ChooserController() {}
-base::string16 ChooserController::GetTitle() const {
+std::pair<base::string16, bool> ChooserController::GetTitlePrefix() const {
if (!owning_frame_)
- return base::string16();
+ return std::make_pair(base::string16(), false /* otherwise */);
url::Origin origin = owning_frame_->GetLastCommittedOrigin();
@@ -35,16 +33,14 @@ base::string16 ChooserController::GetTitle() const {
if (extension_registry) {
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()));
- }
+ if (extension)
+ return std::make_pair(base::UTF8ToUTF16(extension->name()),
+ false /* otherwise */);
}
}
- return l10n_util::GetStringFUTF16(
- IDS_DEVICE_CHOOSER_PROMPT_ORIGIN,
+ return std::make_pair(
url_formatter::FormatOriginForSecurityDisplay(
- origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
+ origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC),
+ true /* URL origin */);
}

Powered by Google App Engine
This is Rietveld 408576698