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

Unified Diff: ui/views/widget/desktop_aura/desktop_cursor_client.h

Issue 12263050: Rework ash::CursorManager into a corewm object, to share code with desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 7 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
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_cursor_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/desktop_cursor_client.h
diff --git a/ui/views/widget/desktop_aura/desktop_cursor_client.h b/ui/views/widget/desktop_aura/desktop_cursor_client.h
deleted file mode 100644
index 18116969dfda8162ea83acd541b22ce413cc7b67..0000000000000000000000000000000000000000
--- a/ui/views/widget/desktop_aura/desktop_cursor_client.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_CLIENT_H_
-#define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_CLIENT_H_
-
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "ui/aura/client/cursor_client.h"
-#include "ui/views/views_export.h"
-
-namespace aura {
-class RootWindow;
-}
-
-namespace ui {
-class CursorLoader;
-}
-
-namespace views {
-
-// A CursorClient that interacts with only one RootWindow. (Unlike the one in
-// ash, which interacts with all the RootWindows.)
-class VIEWS_EXPORT DesktopCursorClient : public aura::client::CursorClient {
- public:
- explicit DesktopCursorClient(aura::RootWindow* window);
- virtual ~DesktopCursorClient();
-
- // Overridden from client::CursorClient:
- virtual void SetCursor(gfx::NativeCursor cursor) OVERRIDE;
- virtual void ShowCursor() OVERRIDE;
- virtual void HideCursor() OVERRIDE;
- virtual bool IsCursorVisible() const OVERRIDE;
- virtual void EnableMouseEvents() OVERRIDE;
- virtual void DisableMouseEvents() OVERRIDE;
- virtual bool IsMouseEventsEnabled() const OVERRIDE;
- virtual void SetDeviceScaleFactor(float device_scale_factor) OVERRIDE;
- virtual void LockCursor() OVERRIDE;
- virtual void UnlockCursor() OVERRIDE;
-
- private:
- void SetCursorVisibility(bool visible);
-
- aura::RootWindow* root_window_;
- scoped_ptr<ui::CursorLoader> cursor_loader_;
-
- gfx::NativeCursor current_cursor_;
- bool cursor_visible_;
-
- DISALLOW_COPY_AND_ASSIGN(DesktopCursorClient);
-};
-
-} // namespace views
-
-#endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_CURSOR_CLIENT_H_
« no previous file with comments | « ui/views/views.gyp ('k') | ui/views/widget/desktop_aura/desktop_cursor_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698