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/shell.cc | |
| 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/shell.cc')
| -rw-r--r-- | ash/shell.cc | 10 |
1 files changed, 5 insertions, 5 deletions
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); |