| Index: chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h
|
| diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h
|
| index 2621d075f47ad726365d50bb4a70be47af1b27ca..584268484f78f0177dfae2e8a4ca3f40a3d2eb6d 100644
|
| --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h
|
| +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h
|
| @@ -9,8 +9,9 @@
|
|
|
| #include "base/memory/singleton.h"
|
| #include "chrome/browser/extensions/chrome_extension_function.h"
|
| +#include "chrome/browser/media/desktop_media_list.h"
|
| #include "chrome/browser/media/desktop_media_picker.h"
|
| -#include "chrome/browser/media/desktop_media_picker_model.h"
|
| +#include "chrome/browser/media/native_desktop_media_list.h"
|
| #include "chrome/common/extensions/api/desktop_capture.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -22,11 +23,11 @@ class DesktopCaptureChooseDesktopMediaFunction
|
| DECLARE_EXTENSION_FUNCTION("desktopCapture.chooseDesktopMedia",
|
| DESKTOPCAPTURE_CHOOSEDESKTOPMEDIA)
|
|
|
| - // Factory creating DesktopMediaPickerModel and DesktopMediaPicker instances.
|
| + // Factory creating DesktopMediaList and DesktopMediaPicker instances.
|
| // Used for tests to supply fake picker.
|
| class PickerFactory {
|
| public:
|
| - virtual scoped_ptr<DesktopMediaPickerModel> CreateModel(
|
| + virtual scoped_ptr<DesktopMediaList> CreateModel(
|
| scoped_ptr<webrtc::ScreenCapturer> screen_capturer,
|
| scoped_ptr<webrtc::WindowCapturer> window_capturer) = 0;
|
| virtual scoped_ptr<DesktopMediaPicker> CreatePicker() = 0;
|
|
|