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

Unified Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm

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, 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm
index 4e8d5c8446a07d4d17c8a1843e8ef204033f5135..73edf1c474abe7b67a648877b7f260a4e0921975 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.mm
@@ -11,6 +11,8 @@
#import "base/mac/bundle_locations.h"
#include "base/strings/sys_string_conversions.h"
#include "chrome/browser/media/combined_desktop_media_list.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
#import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
#import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h"
#include "chrome/common/chrome_switches.h"
@@ -245,14 +247,19 @@ const int kExcessButtonPadding = 6;
sourceID.audio_share = [audioShareCheckbox_ isEnabled] &&
[audioShareCheckbox_ state] == NSOnState;
- // If the media source is an tab, activate it.
if (sourceID.type == content::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(
sourceID.web_contents_id.render_process_id,
sourceID.web_contents_id.main_render_frame_id));
- if (tab)
+ if (tab) {
tab->GetDelegate()->ActivateContents(tab);
+ Browser* browser = chrome::FindBrowserWithWebContents(tab);
+ if (browser && browser->window())
+ browser->window()->Activate();
+ }
}
// Notify the |callback_| asynchronously because it may release the
« no previous file with comments | « no previous file | chrome/browser/ui/views/desktop_capture/desktop_media_picker_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698