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

Unified Diff: remoting/host/fake_desktop_environment.h

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_capturer.cc ('k') | remoting/host/fake_desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/fake_desktop_environment.h
diff --git a/remoting/host/fake_desktop_environment.h b/remoting/host/fake_desktop_environment.h
index 061a2d33979d4b4a3d8b3184320e918604e8d80d..c144d0e5da913e753c55bcea8fef59375c76c84e 100644
--- a/remoting/host/fake_desktop_environment.h
+++ b/remoting/host/fake_desktop_environment.h
@@ -6,10 +6,10 @@
#define REMOTING_HOST_FAKE_DESKTOP_ENVIRONMENT_H_
#include "remoting/host/desktop_environment.h"
-#include "remoting/host/fake_desktop_capturer.h"
#include "remoting/host/fake_mouse_cursor_monitor.h"
#include "remoting/host/input_injector.h"
#include "remoting/host/screen_controls.h"
+#include "remoting/protocol/fake_desktop_capturer.h"
namespace remoting {
@@ -40,10 +40,10 @@ class FakeDesktopEnvironment : public DesktopEnvironment {
FakeDesktopEnvironment();
~FakeDesktopEnvironment() override;
- // Sets frame generator to be used for FakeDesktopCapturer created by
- // FakeDesktopEnvironment.
+ // Sets frame generator to be used for protocol::FakeDesktopCapturer created
+ // by FakeDesktopEnvironment.
void set_frame_generator(
- FakeDesktopCapturer::FrameGenerator frame_generator) {
+ protocol::FakeDesktopCapturer::FrameGenerator frame_generator) {
frame_generator_ = frame_generator;
}
@@ -59,7 +59,7 @@ class FakeDesktopEnvironment : public DesktopEnvironment {
protocol::ClientStub* client_stub) override;
private:
- FakeDesktopCapturer::FrameGenerator frame_generator_;
+ protocol::FakeDesktopCapturer::FrameGenerator frame_generator_;
DISALLOW_COPY_AND_ASSIGN(FakeDesktopEnvironment);
};
@@ -69,10 +69,10 @@ class FakeDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
FakeDesktopEnvironmentFactory();
~FakeDesktopEnvironmentFactory() override;
- // Sets frame generator to be used for FakeDesktopCapturer created by
- // FakeDesktopEnvironment.
+ // Sets frame generator to be used for protocol::FakeDesktopCapturer created
+ // by FakeDesktopEnvironment.
void set_frame_generator(
- FakeDesktopCapturer::FrameGenerator frame_generator) {
+ protocol::FakeDesktopCapturer::FrameGenerator frame_generator) {
frame_generator_ = frame_generator;
}
@@ -84,7 +84,7 @@ class FakeDesktopEnvironmentFactory : public DesktopEnvironmentFactory {
void SetEnableGnubbyAuth(bool enable) override;
private:
- FakeDesktopCapturer::FrameGenerator frame_generator_;
+ protocol::FakeDesktopCapturer::FrameGenerator frame_generator_;
DISALLOW_COPY_AND_ASSIGN(FakeDesktopEnvironmentFactory);
};
« no previous file with comments | « remoting/host/fake_desktop_capturer.cc ('k') | remoting/host/fake_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698