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

Unified Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.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
Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
index b2994abefb6657af423026bc87db4f732095241e..7687432581a8dd117365a0b7ba201f77148333bd 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc
@@ -86,12 +86,14 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
gfx::NativeWindow parent_window;
content::RenderViewHost* render_view;
+ base::string16 target_name;
if (params->target_tab) {
if (!params->target_tab->url) {
error_ = kNoUrlError;
return false;
}
origin_ = GURL(*(params->target_tab->url)).GetOrigin();
+ target_name = base::UTF8ToUTF16(origin_.spec());
if (!params->target_tab->id) {
error_ = kNoTabIdError;
@@ -119,6 +121,7 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
parent_window = web_contents->GetView()->GetTopLevelNativeWindow();
} else {
origin_ = GetExtension()->url();
+ target_name = base::UTF8ToUTF16(GetExtension()->name());
render_view = render_view_host();
parent_window =
GetAssociatedWebContents()->GetView()->GetTopLevelNativeWindow();
@@ -195,6 +198,7 @@ bool DesktopCaptureChooseDesktopMediaFunction::RunImpl() {
picker_->Show(parent_window, parent_window,
base::UTF8ToUTF16(GetExtension()->name()),
+ target_name,
media_list.Pass(), callback);
return true;
}
@@ -212,7 +216,11 @@ void DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults(
MediaCaptureDevicesDispatcher::GetInstance()->
GetDesktopStreamsRegistry();
result = registry->RegisterStream(
- render_process_id_, render_view_id_, origin_, source);
+ render_process_id_,
+ render_view_id_,
+ origin_,
+ source,
+ GetExtension()->name());
}
SetResult(new base::StringValue(result));
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698