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

Side by Side Diff: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h

Issue 89683003: Rename DesktopMediaPickerModel[Impl]->[Native]DesktopMediaList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_API_H_ 5 #ifndef CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_API_H_
6 #define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_API_H_ 6 #define CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_API_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
11 #include "chrome/browser/extensions/chrome_extension_function.h" 11 #include "chrome/browser/extensions/chrome_extension_function.h"
12 #include "chrome/browser/media/desktop_media_list.h"
12 #include "chrome/browser/media/desktop_media_picker.h" 13 #include "chrome/browser/media/desktop_media_picker.h"
13 #include "chrome/browser/media/desktop_media_picker_model.h" 14 #include "chrome/browser/media/native_desktop_media_list.h"
14 #include "chrome/common/extensions/api/desktop_capture.h" 15 #include "chrome/common/extensions/api/desktop_capture.h"
15 #include "url/gurl.h" 16 #include "url/gurl.h"
16 17
17 namespace extensions { 18 namespace extensions {
18 19
19 class DesktopCaptureChooseDesktopMediaFunction 20 class DesktopCaptureChooseDesktopMediaFunction
20 : public ChromeAsyncExtensionFunction { 21 : public ChromeAsyncExtensionFunction {
21 public: 22 public:
22 DECLARE_EXTENSION_FUNCTION("desktopCapture.chooseDesktopMedia", 23 DECLARE_EXTENSION_FUNCTION("desktopCapture.chooseDesktopMedia",
23 DESKTOPCAPTURE_CHOOSEDESKTOPMEDIA) 24 DESKTOPCAPTURE_CHOOSEDESKTOPMEDIA)
24 25
25 // Factory creating DesktopMediaPickerModel and DesktopMediaPicker instances. 26 // Factory creating DesktopMediaList and DesktopMediaPicker instances.
26 // Used for tests to supply fake picker. 27 // Used for tests to supply fake picker.
27 class PickerFactory { 28 class PickerFactory {
28 public: 29 public:
29 virtual scoped_ptr<DesktopMediaPickerModel> CreateModel( 30 virtual scoped_ptr<DesktopMediaList> CreateModel(
30 scoped_ptr<webrtc::ScreenCapturer> screen_capturer, 31 scoped_ptr<webrtc::ScreenCapturer> screen_capturer,
31 scoped_ptr<webrtc::WindowCapturer> window_capturer) = 0; 32 scoped_ptr<webrtc::WindowCapturer> window_capturer) = 0;
32 virtual scoped_ptr<DesktopMediaPicker> CreatePicker() = 0; 33 virtual scoped_ptr<DesktopMediaPicker> CreatePicker() = 0;
33 protected: 34 protected:
34 virtual ~PickerFactory() {} 35 virtual ~PickerFactory() {}
35 }; 36 };
36 37
37 // Used to set PickerFactory used to create mock DesktopMediaPicker instances 38 // Used to set PickerFactory used to create mock DesktopMediaPicker instances
38 // for tests. Calling tests keep ownership of the factory. Can be called with 39 // for tests. Calling tests keep ownership of the factory. Can be called with
39 // |factory| set to NULL at the end of the test. 40 // |factory| set to NULL at the end of the test.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 DesktopCaptureChooseDesktopMediaFunction*> RequestsMap; 107 DesktopCaptureChooseDesktopMediaFunction*> RequestsMap;
107 108
108 RequestsMap requests_; 109 RequestsMap requests_;
109 110
110 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry); 111 DISALLOW_COPY_AND_ASSIGN(DesktopCaptureRequestsRegistry);
111 }; 112 };
112 113
113 } // namespace extensions 114 } // namespace extensions
114 115
115 #endif // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_API_H_ 116 #endif // CHROME_BROWSER_EXTENSIONS_API_DESKTOP_CAPTURE_DESKTOP_CAPTURE_API_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698