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

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

Issue 2035863002: Push the chrome browser of the selected tab to the front of the screen, (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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.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_capture/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
index f43d9024f71e2136260f126fe4e960a675910eb3..3c2481fca8fc8185da34487d269862aaa8b08fd1 100644
--- a/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc
@@ -7,6 +7,8 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "chrome/browser/media/desktop_media_list.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
#include "chrome/browser/ui/views/desktop_capture/desktop_media_list_view.h"
#include "chrome/browser/ui/views/desktop_capture/desktop_media_source_view.h"
#include "chrome/browser/ui/views/desktop_media_picker_views_deprecated.h"
@@ -315,14 +317,22 @@ bool DesktopMediaPickerDialogView::Accept() {
audio_share_checkbox_->visible() &&
audio_share_checkbox_->checked();
- // If the media source is an tab, activate it.
if (source.type == DesktopMediaID::TYPE_WEB_CONTENTS) {
+ // Activate the selected tab and bring the browser window for the selected
+ // tab to the front.
content::WebContents* tab = content::WebContents::FromRenderFrameHost(
content::RenderFrameHost::FromID(
source.web_contents_id.render_process_id,
source.web_contents_id.main_render_frame_id));
- if (tab)
+ if (tab) {
tab->GetDelegate()->ActivateContents(tab);
+ Browser* browser = chrome::FindBrowserWithWebContents(tab);
+ if (browser) {
msw 2016/06/02 22:31:43 optional nit: if (browser && browser->window()) br
GeorgeZ 2016/06/03 15:51:19 Done.
+ BrowserWindow* window = browser->window();
+ if (window)
+ window->Activate();
+ }
+ }
}
if (parent_)
« no previous file with comments | « chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698