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

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

Issue 2072003002: Desktop Capture Picker Window New UI For Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 5 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
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 #ifndef CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_COCOA_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #import "base/mac/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
11 #include "chrome/browser/media/desktop_media_picker.h" 11 #include "chrome/browser/media/desktop_media_picker.h"
12 12
13 @class DesktopMediaPickerControllerDeprecated;
13 @class DesktopMediaPickerController; 14 @class DesktopMediaPickerController;
14 15
15 // Cocoa's DesktopMediaPicker implementation. 16 // Cocoa's DesktopMediaPicker implementation.
16 class DesktopMediaPickerCocoa : public DesktopMediaPicker { 17 class DesktopMediaPickerCocoa : public DesktopMediaPicker {
17 public: 18 public:
18 DesktopMediaPickerCocoa(); 19 DesktopMediaPickerCocoa();
19 ~DesktopMediaPickerCocoa() override; 20 ~DesktopMediaPickerCocoa() override;
20 21
21 // Overridden from DesktopMediaPicker: 22 // Overridden from DesktopMediaPicker:
22 void Show(content::WebContents* web_contents, 23 void Show(content::WebContents* web_contents,
23 gfx::NativeWindow context, 24 gfx::NativeWindow context,
24 gfx::NativeWindow parent, 25 gfx::NativeWindow parent,
25 const base::string16& app_name, 26 const base::string16& app_name,
26 const base::string16& target_name, 27 const base::string16& target_name,
27 std::unique_ptr<DesktopMediaList> screen_list, 28 std::unique_ptr<DesktopMediaList> screen_list,
28 std::unique_ptr<DesktopMediaList> window_list, 29 std::unique_ptr<DesktopMediaList> window_list,
29 std::unique_ptr<DesktopMediaList> tab_list, 30 std::unique_ptr<DesktopMediaList> tab_list,
30 bool request_audio, 31 bool request_audio,
31 const DoneCallback& done_callback) override; 32 const DoneCallback& done_callback) override;
32 33
33 private: 34 private:
35 base::scoped_nsobject<DesktopMediaPickerControllerDeprecated>
36 controller_deprecated_;
37
34 base::scoped_nsobject<DesktopMediaPickerController> controller_; 38 base::scoped_nsobject<DesktopMediaPickerController> controller_;
35 }; 39 };
36 40
37 #endif // CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_COCOA_H_ 41 #endif // CHROME_BROWSER_UI_COCOA_MEDIA_PICKER_DESKTOP_MEDIA_PICKER_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698