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/wm/panel_frame_view.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/wm/panel_frame_view.cc')
| -rw-r--r-- | ash/wm/panel_frame_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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" |