diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:39:50 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 22:39:50 +0000 |
| commit | 3aef722b8c533efc87df683a454f0779f9b6cabb (patch) | |
| tree | e687bdf23ab862c8b7eaca3e094e0caa5d8ee328 /remoting/host/me2me_desktop_environment.h | |
| parent | 67c3f94c2242e71dfe3688985b5f0b781997bb4b (diff) | |
| download | chromium_src-3aef722b8c533efc87df683a454f0779f9b6cabb.zip chromium_src-3aef722b8c533efc87df683a454f0779f9b6cabb.tar.gz chromium_src-3aef722b8c533efc87df683a454f0779f9b6cabb.tar.bz2 | |
Remove screen capturers from media/video/capture/screen.
Screen capturers have been moved to webrtc. This change
switches chromoting and getUserMedia() to the new copy of the
capturers in webrtc and removes old copy from media.
TBR=jschuh@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15692018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/me2me_desktop_environment.h')
| -rw-r--r-- | remoting/host/me2me_desktop_environment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/me2me_desktop_environment.h b/remoting/host/me2me_desktop_environment.h index 316d5c3..1153ec8 100644 --- a/remoting/host/me2me_desktop_environment.h +++ b/remoting/host/me2me_desktop_environment.h @@ -21,7 +21,7 @@ class Me2MeDesktopEnvironment : public BasicDesktopEnvironment { // DesktopEnvironment interface. virtual scoped_ptr<ScreenControls> CreateScreenControls() OVERRIDE; - virtual scoped_ptr<media::ScreenCapturer> CreateVideoCapturer() OVERRIDE; + virtual scoped_ptr<webrtc::ScreenCapturer> CreateVideoCapturer() OVERRIDE; protected: friend class Me2MeDesktopEnvironmentFactory; |