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

Unified Diff: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc

Issue 2122073004: Display extension name on device chooser title (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_chooser_controller_to_chrome_browser
Patch Set: removed unused variable 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
« no previous file with comments | « chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
diff --git a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
index b247e107daa7bc6d2a54e95265cd14db016acb69..c6cb2d1cb7f2c5b8efcda99ad1ee0eb37d5e1629 100644
--- a/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
+++ b/chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.cc
@@ -21,15 +21,11 @@
#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
#include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
-#include "chrome/grit/generated_resources.h"
#include "components/bubble/bubble_controller.h"
-#include "components/url_formatter/elide_url.h"
-#include "ui/base/l10n/l10n_util.h"
#include "ui/views/controls/styled_label.h"
#include "ui/views/controls/styled_label_listener.h"
#include "ui/views/controls/table/table_view_observer.h"
#include "ui/views/window/dialog_client_view.h"
-#include "url/origin.h"
std::unique_ptr<BubbleUi> ChooserBubbleDelegate::BuildBubbleUi() {
return base::WrapUnique(
@@ -81,7 +77,6 @@ class ChooserBubbleUiViewDelegate : public views::BubbleDialogDelegateView,
void UpdateTableModel() const;
private:
- url::Origin origin_;
ChooserContentView* chooser_content_view_;
BubbleReference bubble_reference_;
@@ -109,7 +104,6 @@ ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
// | Not seeing your device? Get help |
// ------------------------------------
- origin_ = chooser_controller->GetOrigin();
chooser_content_view_ =
new ChooserContentView(this, std::move(chooser_controller));
}
@@ -117,10 +111,7 @@ ChooserBubbleUiViewDelegate::ChooserBubbleUiViewDelegate(
ChooserBubbleUiViewDelegate::~ChooserBubbleUiViewDelegate() {}
base::string16 ChooserBubbleUiViewDelegate::GetWindowTitle() const {
- return l10n_util::GetStringFUTF16(
- IDS_DEVICE_CHOOSER_PROMPT,
- url_formatter::FormatOriginForSecurityDisplay(
- origin_, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
+ return chooser_content_view_->GetWindowTitle();
}
base::string16 ChooserBubbleUiViewDelegate::GetDialogButtonLabel(
« no previous file with comments | « chrome/browser/ui/views/extensions/chooser_dialog_view_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698