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

Side by Side Diff: chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.mm

Issue 281383008: Made desktop capture screen tab-constrained in ASH (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h" 5 #include "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h"
6 6
7 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h" 7 #import "chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller.h"
8 8
9 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() { 9 DesktopMediaPickerCocoa::DesktopMediaPickerCocoa() {
10 } 10 }
11 11
12 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() { 12 DesktopMediaPickerCocoa::~DesktopMediaPickerCocoa() {
13 } 13 }
14 14
15 void DesktopMediaPickerCocoa::Show(gfx::NativeWindow context, 15 void DesktopMediaPickerCocoa::Show(content::WebContents* web_contents,
16 gfx::NativeWindow context,
16 gfx::NativeWindow parent, 17 gfx::NativeWindow parent,
17 const base::string16& app_name, 18 const base::string16& app_name,
18 const base::string16& target_name, 19 const base::string16& target_name,
19 scoped_ptr<DesktopMediaList> media_list, 20 scoped_ptr<DesktopMediaList> media_list,
20 const DoneCallback& done_callback) { 21 const DoneCallback& done_callback) {
21 controller_.reset( 22 controller_.reset(
22 [[DesktopMediaPickerController alloc] initWithMediaList:media_list.Pass() 23 [[DesktopMediaPickerController alloc] initWithMediaList:media_list.Pass()
23 parent:parent 24 parent:parent
24 callback:done_callback 25 callback:done_callback
25 appName:app_name 26 appName:app_name
26 targetName:target_name]); 27 targetName:target_name]);
27 [controller_ showWindow:nil]; 28 [controller_ showWindow:nil];
28 } 29 }
29 30
30 // static 31 // static
31 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() { 32 scoped_ptr<DesktopMediaPicker> DesktopMediaPicker::Create() {
32 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa()); 33 return scoped_ptr<DesktopMediaPicker>(new DesktopMediaPickerCocoa());
33 } 34 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698