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

Unified Diff: chrome/browser/ui/views/desktop_media_picker_views.cc

Issue 186133005: Adds extension name to the screencast notification bar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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/cocoa/media_picker/desktop_media_picker_controller_unittest.mm ('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/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index aaf752e085d10a736d7cd0632658fd3fe3fe8d67..87c06dea2a7b5b836aa7deeb7cdec46c5b5ea468 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -154,6 +154,7 @@ class DesktopMediaPickerDialogView : public views::DialogDelegateView {
gfx::NativeWindow parent_window,
DesktopMediaPickerViews* parent,
const base::string16& app_name,
+ const base::string16& target_name,
scoped_ptr<DesktopMediaList> media_list);
virtual ~DesktopMediaPickerDialogView();
@@ -199,6 +200,7 @@ class DesktopMediaPickerViews : public DesktopMediaPicker {
virtual void Show(gfx::NativeWindow context,
gfx::NativeWindow parent,
const base::string16& app_name,
+ const base::string16& target_name,
scoped_ptr<DesktopMediaList> media_list,
const DoneCallback& done_callback) OVERRIDE;
@@ -490,14 +492,20 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
gfx::NativeWindow parent_window,
DesktopMediaPickerViews* parent,
const base::string16& app_name,
+ const base::string16& target_name,
scoped_ptr<DesktopMediaList> media_list)
: parent_(parent),
app_name_(app_name),
label_(new views::Label()),
scroll_view_(views::ScrollView::CreateScrollViewWithBorder()),
list_view_(new DesktopMediaListView(this, media_list.Pass())) {
- label_->SetText(
- l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TEXT, app_name_));
+ if (app_name == target_name) {
+ label_->SetText(
+ l10n_util::GetStringFUTF16(IDS_DESKTOP_MEDIA_PICKER_TEXT, app_name));
+ } else {
+ label_->SetText(l10n_util::GetStringFUTF16(
+ IDS_DESKTOP_MEDIA_PICKER_TEXT_DELEGATED, app_name, target_name));
+ }
label_->SetMultiLine(true);
label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
AddChildView(label_);
@@ -624,11 +632,12 @@ DesktopMediaPickerViews::~DesktopMediaPickerViews() {
void DesktopMediaPickerViews::Show(gfx::NativeWindow context,
gfx::NativeWindow parent,
const base::string16& app_name,
+ const base::string16& target_name,
scoped_ptr<DesktopMediaList> media_list,
const DoneCallback& done_callback) {
callback_ = done_callback;
dialog_ = new DesktopMediaPickerDialogView(
- context, parent, this, app_name, media_list.Pass());
+ context, parent, this, app_name, target_name, media_list.Pass());
}
void DesktopMediaPickerViews::NotifyDialogResult(
« no previous file with comments | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698