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

Unified Diff: ash/display/mirror_window_controller.h

Issue 145313003: Implement cursor compositing mode on Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix linux_aura build. Created 6 years, 11 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
Index: ash/display/mirror_window_controller.h
diff --git a/ash/display/mirror_window_controller.h b/ash/display/mirror_window_controller.h
index 86773f18eec6bb44ef9d0e3b8e2d68512ae12649..907dd0de158b1bf18b9f945fef40b9019c76735b 100644
--- a/ash/display/mirror_window_controller.h
+++ b/ash/display/mirror_window_controller.h
@@ -6,6 +6,7 @@
#define ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
#include "ash/ash_export.h"
+#include "ash/display/cursor_window_controller.h"
#include "base/compiler_specific.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
@@ -32,12 +33,12 @@ class MirrorWindowTestApi;
namespace internal {
class DisplayInfo;
-class CursorWindowDelegate;
// An object that copies the content of the primary root window to a
// mirror window. This also draws a mouse cursor as the mouse cursor
// is typically drawn by the window system.
-class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver {
+class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver,
+ public CursorWindowController {
public:
MirrorWindowController();
virtual ~MirrorWindowController();
@@ -53,12 +54,6 @@ class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver {
// Close the mirror window.
void Close();
- // Updates the mirrored cursor location,shape and
- // visibility.
- void UpdateCursorLocation();
- void SetMirroredCursor(gfx::NativeCursor cursor);
- void SetMirroredCursorVisibility(bool visible);
-
// aura::RootWindowObserver overrides:
virtual void OnWindowTreeHostResized(const aura::RootWindow* root) OVERRIDE;
@@ -69,12 +64,7 @@ class ASH_EXPORT MirrorWindowController : public aura::RootWindowObserver {
// configuration.
scoped_ptr<aura::RootWindowTransformer> CreateRootWindowTransformer() const;
- int current_cursor_type_;
- gfx::Display::Rotation current_cursor_rotation_;
- aura::Window* cursor_window_; // owned by root window.
scoped_ptr<aura::RootWindow> root_window_;
- scoped_ptr<CursorWindowDelegate> cursor_window_delegate_;
- gfx::Point hot_point_;
gfx::Size mirror_window_host_size_;
scoped_refptr<ui::Reflector> reflector_;

Powered by Google App Engine
This is Rietveld 408576698