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

Unified Diff: remoting/host/capturer_mac.cc

Issue 10382184: [Chromoting] Initial plumbing for cursor shape. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused vars. Fix Mac Capturer Unittest. Created 8 years, 7 months 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/capturer_linux.cc ('k') | remoting/host/capturer_mac_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/capturer_mac.cc
diff --git a/remoting/host/capturer_mac.cc b/remoting/host/capturer_mac.cc
index 6c016225c34b390b80c407d25095a96c9f2de6c9..6afbd09dbc4687dbde4ca975b1183d0fcd102210 100644
--- a/remoting/host/capturer_mac.cc
+++ b/remoting/host/capturer_mac.cc
@@ -17,9 +17,10 @@
#include "base/memory/scoped_ptr.h"
#include "base/synchronization/waitable_event.h"
#include "base/time.h"
+#include "remoting/base/capture_data.h"
#include "remoting/base/util.h"
#include "remoting/host/capturer_helper.h"
-
+#include "remoting/proto/control.pb.h"
namespace remoting {
@@ -158,7 +159,7 @@ class CapturerMac : public Capturer {
bool Init();
// Capturer interface.
- virtual void Start() OVERRIDE;
+ virtual void Start(const CursorShapeChangedCallback& callback) OVERRIDE;
virtual void Stop() OVERRIDE;
virtual void ScreenConfigurationChanged() OVERRIDE;
virtual media::VideoFrame::Format pixel_format() const OVERRIDE;
@@ -206,6 +207,9 @@ class CapturerMac : public Capturer {
// recently captured screen.
CapturerHelper helper_;
+ // Callback notified whenever the cursor shape is changed.
+ CursorShapeChangedCallback cursor_shape_changed_callback_;
+
// The current buffer with valid data for reading.
int current_buffer_;
@@ -306,7 +310,10 @@ void CapturerMac::ReleaseBuffers() {
}
}
-void CapturerMac::Start() {
+void CapturerMac::Start(
+ const CursorShapeChangedCallback& callback) {
+ cursor_shape_changed_callback_ = callback;
+
// Create power management assertions to wake the display and prevent it from
// going to sleep on user idle.
IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep,
« no previous file with comments | « remoting/host/capturer_linux.cc ('k') | remoting/host/capturer_mac_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698