diff options
author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 21:14:36 +0000 |
---|---|---|
committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 21:14:36 +0000 |
commit | c78395583ae96c6ad4287cc1af8ec2ba1cd038c8 (patch) | |
tree | 7d3190a78c9c6b243ab5ea6a1c12090835edc3f4 /ash | |
parent | 741a46a76bd8f09547a3ea8967f380ccde31ae65 (diff) | |
download | chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.zip chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.tar.gz chromium_src-c78395583ae96c6ad4287cc1af8ec2ba1cd038c8.tar.bz2 |
aura-x11: Add custom web cursor support.
BUG=102562
TEST=manually (using sites that use custom cursor, e.g.: http://beradrian.users.sourceforge.net/articles/cursor.html)
Review URL: https://chromiumcodereview.appspot.com/9463003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r-- | ash/drag_drop/drag_drop_controller.cc | 6 | ||||
-rw-r--r-- | ash/shell.cc | 10 | ||||
-rw-r--r-- | ash/wm/panel_frame_view.cc | 6 | ||||
-rw-r--r-- | ash/wm/panel_window_event_filter.cc | 2 | ||||
-rw-r--r-- | ash/wm/partial_screenshot_view.cc | 4 | ||||
-rw-r--r-- | ash/wm/root_window_event_filter.cc | 18 | ||||
-rw-r--r-- | ash/wm/root_window_event_filter_unittest.cc | 26 | ||||
-rw-r--r-- | ash/wm/toplevel_window_event_filter.cc | 4 |
8 files changed, 40 insertions, 36 deletions
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 5510081..dd52f82 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc @@ -114,7 +114,7 @@ void DragDropController::DragUpdate(aura::Window* target, drag_operation_); int op = delegate->OnDragUpdated(e); gfx::NativeCursor cursor = (op == ui::DragDropTypes::DRAG_NONE)? - aura::kCursorMove : aura::kCursorHand; + ui::kCursorMove : ui::kCursorHand; Shell::GetRootWindow()->SetCursor(cursor); } } @@ -128,7 +128,7 @@ void DragDropController::DragUpdate(aura::Window* target, void DragDropController::Drop(aura::Window* target, const aura::LocatedEvent& event) { - Shell::GetRootWindow()->SetCursor(aura::kCursorPointer); + Shell::GetRootWindow()->SetCursor(ui::kCursorPointer); aura::client::DragDropDelegate* delegate = NULL; // |drag_window_| can be NULL if we have just started the drag and have not @@ -153,7 +153,7 @@ void DragDropController::Drop(aura::Window* target, } void DragDropController::DragCancel() { - Shell::GetRootWindow()->SetCursor(aura::kCursorPointer); + Shell::GetRootWindow()->SetCursor(ui::kCursorPointer); aura::client::DragDropDelegate* delegate = NULL; if ((delegate = aura::client::GetDragDropDelegate(drag_window_))) { delegate->OnDragExited(); diff --git a/ash/shell.cc b/ash/shell.cc index 21af31b..e06d5e1 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -15,8 +15,8 @@ #include "ash/focus_cycler.h" #include "ash/ime/input_method_event_filter.h" #include "ash/launcher/launcher.h" -#include "ash/monitor/multi_monitor_manager.h" #include "ash/monitor/monitor_controller.h" +#include "ash/monitor/multi_monitor_manager.h" #include "ash/screen_ash.h" #include "ash/shell_delegate.h" #include "ash/shell_factory.h" @@ -31,8 +31,8 @@ #include "ash/system/power/power_supply_status.h" #include "ash/system/power/tray_power.h" #include "ash/system/settings/tray_settings.h" -#include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/system_tray.h" +#include "ash/system/tray/system_tray_delegate.h" #include "ash/system/tray/tray_empty.h" #include "ash/system/tray_accessibility.h" #include "ash/system/tray_caps_lock.h" @@ -45,8 +45,8 @@ #include "ash/wm/dialog_frame_view.h" #include "ash/wm/event_client_impl.h" #include "ash/wm/key_rewriter_event_filter.h" -#include "ash/wm/panel_window_event_filter.h" #include "ash/wm/panel_layout_manager.h" +#include "ash/wm/panel_window_event_filter.h" #include "ash/wm/partial_screenshot_event_filter.h" #include "ash/wm/power_button_controller.h" #include "ash/wm/resize_shadow_controller.h" @@ -64,10 +64,10 @@ #include "ash/wm/window_modality_controller.h" #include "ash/wm/window_util.h" #include "ash/wm/workspace/always_on_top_layout_manager.h" -#include "ash/wm/workspace_controller.h" #include "ash/wm/workspace/workspace_event_filter.h" #include "ash/wm/workspace/workspace_layout_manager.h" #include "ash/wm/workspace/workspace_manager.h" +#include "ash/wm/workspace_controller.h" #include "base/bind.h" #include "base/command_line.h" #include "grit/ui_resources.h" @@ -647,7 +647,7 @@ void Shell::Init() { input_method_filter_.reset(new internal::InputMethodEventFilter); AddRootWindowEventFilter(input_method_filter_.get()); - root_window->SetCursor(aura::kCursorPointer); + root_window->SetCursor(ui::kCursorPointer); if (initially_hide_cursor_) root_window->ShowCursor(false); diff --git a/ash/wm/panel_frame_view.cc b/ash/wm/panel_frame_view.cc index 4ed23b5..dfbce25 100644 --- a/ash/wm/panel_frame_view.cc +++ b/ash/wm/panel_frame_view.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ash/wm/panel_frame_view.h" #include "ash/wm/frame_painter.h" +#include "ash/wm/panel_frame_view.h" #include "grit/ui_resources.h" #include "grit/ui_strings.h" // Accessibility names #include "third_party/skia/include/core/SkPaint.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/aura/cursor.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" diff --git a/ash/wm/panel_window_event_filter.cc b/ash/wm/panel_window_event_filter.cc index 8eca9d4..c4bf829 100644 --- a/ash/wm/panel_window_event_filter.cc +++ b/ash/wm/panel_window_event_filter.cc @@ -7,11 +7,11 @@ #include "ash/wm/window_util.h" #include "base/message_loop.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/cursor.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/compositor/scoped_layer_animation_settings.h" diff --git a/ash/wm/partial_screenshot_view.cc b/ash/wm/partial_screenshot_view.cc index 9cb29df..42ae2503 100644 --- a/ash/wm/partial_screenshot_view.cc +++ b/ash/wm/partial_screenshot_view.cc @@ -8,9 +8,9 @@ #include "ash/shell.h" #include "ash/shell_window_ids.h" #include "ash/wm/partial_screenshot_event_filter.h" -#include "ui/aura/cursor.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/base/cursor/cursor.h" #include "ui/gfx/canvas.h" #include "ui/gfx/rect.h" #include "ui/views/view.h" @@ -71,7 +71,7 @@ void PartialScreenshotView::Cancel() { gfx::NativeCursor PartialScreenshotView::GetCursor( const views::MouseEvent& event) { // Always use "crosshair" cursor. - return aura::kCursorCross; + return ui::kCursorCross; } void PartialScreenshotView::OnPaint(gfx::Canvas* canvas) { diff --git a/ash/wm/root_window_event_filter.cc b/ash/wm/root_window_event_filter.cc index 4c52320..822dfe6 100644 --- a/ash/wm/root_window_event_filter.cc +++ b/ash/wm/root_window_event_filter.cc @@ -46,23 +46,23 @@ gfx::NativeCursor RootWindowEventFilter::CursorForWindowComponent( int window_component) { switch (window_component) { case HTBOTTOM: - return aura::kCursorSouthResize; + return ui::kCursorSouthResize; case HTBOTTOMLEFT: - return aura::kCursorSouthWestResize; + return ui::kCursorSouthWestResize; case HTBOTTOMRIGHT: - return aura::kCursorSouthEastResize; + return ui::kCursorSouthEastResize; case HTLEFT: - return aura::kCursorWestResize; + return ui::kCursorWestResize; case HTRIGHT: - return aura::kCursorEastResize; + return ui::kCursorEastResize; case HTTOP: - return aura::kCursorNorthResize; + return ui::kCursorNorthResize; case HTTOPLEFT: - return aura::kCursorNorthWestResize; + return ui::kCursorNorthWestResize; case HTTOPRIGHT: - return aura::kCursorNorthEastResize; + return ui::kCursorNorthEastResize; default: - return aura::kCursorNull; + return ui::kCursorNull; } } diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc index 6266839..c2c3cda 100644 --- a/ash/wm/root_window_event_filter_unittest.cc +++ b/ash/wm/root_window_event_filter_unittest.cc @@ -13,7 +13,6 @@ #include "ash/wm/window_util.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/activation_delegate.h" -#include "ui/aura/cursor.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/test/aura_test_base.h" @@ -21,6 +20,7 @@ #include "ui/aura/test/test_event_filter.h" #include "ui/aura/test/test_window_delegate.h" #include "ui/aura/test/test_windows.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/gfx/screen.h" @@ -375,45 +375,49 @@ TEST_F(RootWindowEventFilterTest, MouseEventCursors) { aura::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0x0); // Cursor starts as a pointer (set during Shell::Init()). - EXPECT_EQ(aura::kCursorPointer, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorPointer, root_window->last_cursor().native_type()); // Resize edges and corners show proper cursors. window_delegate.set_hittest_code(HTBOTTOM); root_window->DispatchMouseEvent(&move1); - EXPECT_EQ(aura::kCursorSouthResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorSouthResize, root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTBOTTOMLEFT); root_window->DispatchMouseEvent(&move2); - EXPECT_EQ(aura::kCursorSouthWestResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorSouthWestResize, + root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTBOTTOMRIGHT); root_window->DispatchMouseEvent(&move1); - EXPECT_EQ(aura::kCursorSouthEastResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorSouthEastResize, + root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTLEFT); root_window->DispatchMouseEvent(&move2); - EXPECT_EQ(aura::kCursorWestResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorWestResize, root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTRIGHT); root_window->DispatchMouseEvent(&move1); - EXPECT_EQ(aura::kCursorEastResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorEastResize, root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTTOP); root_window->DispatchMouseEvent(&move2); - EXPECT_EQ(aura::kCursorNorthResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorNorthResize, root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTTOPLEFT); root_window->DispatchMouseEvent(&move1); - EXPECT_EQ(aura::kCursorNorthWestResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorNorthWestResize, + root_window->last_cursor().native_type()); window_delegate.set_hittest_code(HTTOPRIGHT); root_window->DispatchMouseEvent(&move2); - EXPECT_EQ(aura::kCursorNorthEastResize, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorNorthEastResize, + root_window->last_cursor().native_type()); // Client area uses null cursor. window_delegate.set_hittest_code(HTCLIENT); root_window->DispatchMouseEvent(&move1); - EXPECT_EQ(aura::kCursorNull, root_window->last_cursor()); + EXPECT_EQ(ui::kCursorNull, root_window->last_cursor().native_type()); } #if defined(OS_MACOSX) diff --git a/ash/wm/toplevel_window_event_filter.cc b/ash/wm/toplevel_window_event_filter.cc index 3de5075..962698ff 100644 --- a/ash/wm/toplevel_window_event_filter.cc +++ b/ash/wm/toplevel_window_event_filter.cc @@ -12,12 +12,12 @@ #include "ash/wm/window_util.h" #include "base/message_loop.h" #include "ui/aura/client/aura_constants.h" -#include "ui/aura/cursor.h" #include "ui/aura/env.h" #include "ui/aura/event.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/aura/window_delegate.h" +#include "ui/base/cursor/cursor.h" #include "ui/base/hit_test.h" #include "ui/base/ui_base_types.h" #include "ui/gfx/screen.h" @@ -163,7 +163,7 @@ void ToplevelWindowEventFilter::RunMoveLoop(aura::Window* source) { root_window, source->parent(), &parent_mouse_location); window_resizer_.reset( CreateWindowResizer(source, parent_mouse_location, HTCAPTION)); - source->GetRootWindow()->SetCursor(aura::kCursorPointer); + source->GetRootWindow()->SetCursor(ui::kCursorPointer); #if !defined(OS_MACOSX) MessageLoopForUI* loop = MessageLoopForUI::current(); MessageLoop::ScopedNestableTaskAllower allow_nested(loop); |