Chromium Code Reviews| 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 c6a2a6e41916c46611fe0f55dc843a7f4c38c6d7..e3aaaa3cd83cacf765277f13be63d9e84f3fea27 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 |
| @@ -5,9 +5,11 @@ |
| #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h" |
| #include "base/bind.h" |
| +#include "base/command_line.h" |
| #import "base/mac/bundle_locations.h" |
| #include "base/strings/sys_string_conversions.h" |
| #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_item.h" |
| +#include "chrome/common/chrome_switches.h" |
| #include "chrome/grit/generated_resources.h" |
| #include "content/public/browser/browser_thread.h" |
| #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" |
| @@ -283,6 +285,15 @@ const int kExcessButtonPadding = 6; |
| imageTitle:imageTitle]); |
| [items_ insertObject:item atIndex:index]; |
| [sourceBrowser_ reloadData]; |
| + |
| + NSString* autoselectSource = base::SysUTF8ToNSString( |
| + base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
| + switches::kAutoSelectDesktopCaptureSource)); |
| + |
| + if ([autoselectSource isEqualToString:imageTitle]) { |
| + [self reportResult:[item sourceID]]; |
|
phoglund_chromium
2015/04/14 12:41:22
I assume here it's OK to do this on this thread an
groby-ooo-7-16
2015/04/14 15:01:21
It *should* be OK. sourceAddedAtIndex definitely h
dcaiafa
2015/04/22 20:32:42
It's been a while since I looked at this code, but
|
| + [self close]; |
| + } |
| } |
| - (void)sourceRemovedAtIndex:(int)index { |