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

Unified Diff: remoting/host/fake_desktop_environment.cc

Issue 1462063004: Move VideoFramePump to remoting/protocol (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/fake_desktop_environment.h ('k') | remoting/host/host_mock_objects.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/fake_desktop_environment.cc
diff --git a/remoting/host/fake_desktop_environment.cc b/remoting/host/fake_desktop_environment.cc
index bff63233c46bd7666e746c85a12787121ad042b9..4e887d9c798369cf5a5779602637c28883b495b8 100644
--- a/remoting/host/fake_desktop_environment.cc
+++ b/remoting/host/fake_desktop_environment.cc
@@ -5,9 +5,9 @@
#include "remoting/host/fake_desktop_environment.h"
#include "remoting/host/audio_capturer.h"
-#include "remoting/host/fake_desktop_capturer.h"
#include "remoting/host/gnubby_auth_handler.h"
#include "remoting/host/input_injector.h"
+#include "remoting/protocol/fake_desktop_capturer.h"
namespace remoting {
@@ -60,7 +60,8 @@ scoped_ptr<ScreenControls> FakeDesktopEnvironment::CreateScreenControls() {
scoped_ptr<webrtc::DesktopCapturer>
FakeDesktopEnvironment::CreateVideoCapturer() {
- scoped_ptr<FakeDesktopCapturer> result(new FakeDesktopCapturer());
+ scoped_ptr<protocol::FakeDesktopCapturer> result(
+ new protocol::FakeDesktopCapturer());
if (!frame_generator_.is_null())
result->set_frame_generator(frame_generator_);
return result.Pass();
« no previous file with comments | « remoting/host/fake_desktop_environment.h ('k') | remoting/host/host_mock_objects.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698