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

Unified Diff: ui/aura/cursor_manager.cc

Issue 10692170: Aura desktop: Show resize cursors again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT Created 8 years, 5 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/aura/cursor_manager.h ('k') | ui/aura/desktop/desktop_cursor_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/cursor_manager.cc
diff --git a/ui/aura/cursor_manager.cc b/ui/aura/cursor_manager.cc
deleted file mode 100644
index 30c7af1c2891ca14a133e168b2538cdb67481452..0000000000000000000000000000000000000000
--- a/ui/aura/cursor_manager.cc
+++ /dev/null
@@ -1,58 +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.
-
-#include "ui/aura/cursor_manager.h"
-
-#include "base/logging.h"
-#include "ui/aura/cursor_delegate.h"
-#include "ui/aura/env.h"
-
-namespace aura {
-
-CursorManager::CursorManager()
- : delegate_(NULL),
- cursor_lock_count_(0),
- did_cursor_change_(false),
- cursor_to_set_on_unlock_(0),
- cursor_visible_(true) {
-}
-
-CursorManager::~CursorManager() {
-}
-
-void CursorManager::LockCursor() {
- cursor_lock_count_++;
-}
-
-void CursorManager::UnlockCursor() {
- cursor_lock_count_--;
- DCHECK_GE(cursor_lock_count_, 0);
- if (cursor_lock_count_ == 0) {
- if (did_cursor_change_) {
- did_cursor_change_ = false;
- if (delegate_)
- delegate_->SetCursor(cursor_to_set_on_unlock_);
- }
- did_cursor_change_ = false;
- cursor_to_set_on_unlock_ = gfx::kNullCursor;
- }
-}
-
-void CursorManager::SetCursor(gfx::NativeCursor cursor) {
- if (cursor_lock_count_ == 0) {
- if (delegate_)
- delegate_->SetCursor(cursor);
- } else {
- cursor_to_set_on_unlock_ = cursor;
- did_cursor_change_ = true;
- }
-}
-
-void CursorManager::ShowCursor(bool show) {
- cursor_visible_ = show;
- if (delegate_)
- delegate_->ShowCursor(show);
-}
-
-} // namespace aura
« no previous file with comments | « ui/aura/cursor_manager.h ('k') | ui/aura/desktop/desktop_cursor_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698