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

Side by Side Diff: chrome/browser/ui/views/extensions/chooser_dialog_view.cc

Issue 2061193003: Remove "BUBBLE" from chooser related string IDs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h" 5 #include "chrome/browser/ui/views/extensions/chooser_dialog_view.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h" 8 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
9 #include "chrome/browser/ui/views/chooser_content_view.h" 9 #include "chrome/browser/ui/views/chooser_content_view.h"
10 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 GURL(origin.Serialize())); 58 GURL(origin.Serialize()));
59 if (extension) 59 if (extension)
60 chooser_title = base::UTF8ToUTF16(extension->name()); 60 chooser_title = base::UTF8ToUTF16(extension->name());
61 } 61 }
62 62
63 if (chooser_title.empty()) { 63 if (chooser_title.empty()) {
64 chooser_title = url_formatter::FormatOriginForSecurityDisplay( 64 chooser_title = url_formatter::FormatOriginForSecurityDisplay(
65 origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC); 65 origin, url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC);
66 } 66 }
67 67
68 return l10n_util::GetStringFUTF16(IDS_CHOOSER_BUBBLE_PROMPT, chooser_title); 68 return l10n_util::GetStringFUTF16(IDS_DEVICE_CHOOSER_PROMPT, chooser_title);
69 } 69 }
70 70
71 bool ChooserDialogView::ShouldShowCloseButton() const { 71 bool ChooserDialogView::ShouldShowCloseButton() const {
72 return false; 72 return false;
73 } 73 }
74 74
75 ui::ModalType ChooserDialogView::GetModalType() const { 75 ui::ModalType ChooserDialogView::GetModalType() const {
76 return ui::MODAL_TYPE_CHILD; 76 return ui::MODAL_TYPE_CHILD;
77 } 77 }
78 78
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 DCHECK(chooser_controller); 136 DCHECK(chooser_controller);
137 137
138 web_modal::WebContentsModalDialogManager* manager = 138 web_modal::WebContentsModalDialogManager* manager =
139 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_); 139 web_modal::WebContentsModalDialogManager::FromWebContents(web_contents_);
140 if (manager) { 140 if (manager) {
141 constrained_window::ShowWebModalDialogViews( 141 constrained_window::ShowWebModalDialogViews(
142 new ChooserDialogView(web_contents_, chooser_controller), 142 new ChooserDialogView(web_contents_, chooser_controller),
143 web_contents_); 143 web_contents_);
144 } 144 }
145 } 145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698