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

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: Get rid of current_cursor_set_ and requested_cursor_set_ Created 6 years, 10 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..06a586e9373b9a1e02e8007fd25d7432f37f481b 100644
--- a/ash/display/mirror_window_controller.h
+++ b/ash/display/mirror_window_controller.h
@@ -32,7 +32,6 @@ 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
@@ -53,15 +52,12 @@ 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;
+ // Returns the mirror root window.
+ aura::RootWindow* root_window() const { return root_window_.get(); }
+
private:
friend class test::MirrorWindowTestApi;
@@ -69,12 +65,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