diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 00:54:19 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 00:54:19 +0000 |
| commit | 4b8003cd9f0cdc48c681a5c69c51610771d25f32 (patch) | |
| tree | 1322bf592dcf003d7c918401b6a0637fc75c4c19 /ash/tooltips | |
| parent | 9746f9132e55a91d2ec3d866711277b874574743 (diff) | |
| download | chromium_src-4b8003cd9f0cdc48c681a5c69c51610771d25f32.zip chromium_src-4b8003cd9f0cdc48c681a5c69c51610771d25f32.tar.gz chromium_src-4b8003cd9f0cdc48c681a5c69c51610771d25f32.tar.bz2 | |
Aura desktop: Show resize cursors again.
This moves CursorManager into ash/wm/ and makes it an implementation of a new
CursorClient interface. It's really an implementation detail of ash. Then
create a desktop version of this interface.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10692170
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/tooltips')
| -rw-r--r-- | ash/tooltips/tooltip_controller.cc | 4 | ||||
| -rw-r--r-- | ash/tooltips/tooltip_controller_unittest.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ash/tooltips/tooltip_controller.cc b/ash/tooltips/tooltip_controller.cc index 937ebc7..4704271 100644 --- a/ash/tooltips/tooltip_controller.cc +++ b/ash/tooltips/tooltip_controller.cc @@ -8,12 +8,12 @@ #include "ash/ash_switches.h" #include "ash/shell.h" +#include "ash/wm/cursor_manager.h" #include "base/command_line.h" #include "base/location.h" #include "base/string_split.h" #include "base/time.h" #include "ui/aura/client/drag_drop_client.h" -#include "ui/aura/cursor_manager.h" #include "ui/aura/env.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" @@ -403,7 +403,7 @@ void TooltipController::TooltipShownTimerFired() { void TooltipController::UpdateIfRequired() { if (!tooltips_enabled_ || mouse_pressed_ || IsDragDropInProgress() || - !aura::Env::GetInstance()->cursor_manager()->cursor_visible()) { + !ash::Shell::GetInstance()->cursor_manager()->cursor_visible()) { GetTooltip()->Hide(); return; } diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc index c1febfd..bd8405f 100644 --- a/ash/tooltips/tooltip_controller_unittest.cc +++ b/ash/tooltips/tooltip_controller_unittest.cc @@ -5,9 +5,9 @@ #include "ash/shell.h" #include "ash/test/ash_test_base.h" #include "ash/tooltips/tooltip_controller.h" +#include "ash/wm/cursor_manager.h" #include "base/utf_string_conversions.h" #include "ui/aura/client/tooltip_client.h" -#include "ui/aura/cursor_manager.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" #include "ui/aura/test/event_generator.h" @@ -259,12 +259,12 @@ TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) { EXPECT_TRUE(IsTooltipVisible()); // Hide the cursor and check again. - aura::Env::GetInstance()->cursor_manager()->ShowCursor(false); + ash::Shell::GetInstance()->cursor_manager()->ShowCursor(false); FireTooltipTimer(); EXPECT_FALSE(IsTooltipVisible()); // Show the cursor and re-check. - aura::Env::GetInstance()->cursor_manager()->ShowCursor(true); + ash::Shell::GetInstance()->cursor_manager()->ShowCursor(true); FireTooltipTimer(); EXPECT_TRUE(IsTooltipVisible()); } |