diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 03:56:57 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-13 03:56:57 +0000 |
| commit | 8b4bc722085237b6950dc9d89f642e37dbc905ca (patch) | |
| tree | b202714c2d0f7fcea4dc4dc64cd117176d6ce816 /ui/ui.gyp | |
| parent | 048a0adfde91c46604c0f7c62a6d55330426bb57 (diff) | |
| download | chromium_src-8b4bc722085237b6950dc9d89f642e37dbc905ca.zip chromium_src-8b4bc722085237b6950dc9d89f642e37dbc905ca.tar.gz chromium_src-8b4bc722085237b6950dc9d89f642e37dbc905ca.tar.bz2 | |
Adding Ozone CursorLoader and necessary API functions to allow setting the cursor in SoftwareFactoryOzone
BUG=
Review URL: https://codereview.chromium.org/158023006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250929 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/ui.gyp')
| -rw-r--r-- | ui/ui.gyp | 13 |
1 files changed, 3 insertions, 10 deletions
@@ -127,13 +127,13 @@ 'base/cursor/cursor.h', 'base/cursor/cursor_android.cc', 'base/cursor/cursor_loader.h', - 'base/cursor/cursor_loader_null.cc', - 'base/cursor/cursor_loader_null.h', + 'base/cursor/cursor_loader_ozone.cc', + 'base/cursor/cursor_loader_ozone.h', 'base/cursor/cursor_loader_win.cc', 'base/cursor/cursor_loader_win.h', 'base/cursor/cursor_loader_x11.cc', 'base/cursor/cursor_loader_x11.h', - 'base/cursor/cursor_null.cc', + 'base/cursor/cursor_ozone.cc', 'base/cursor/cursor_mac.mm', 'base/cursor/cursor_win.cc', 'base/cursor/cursor_x11.cc', @@ -536,13 +536,6 @@ '../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc. ], }], - ['use_ozone==0', { - 'sources!': [ - 'base/cursor/cursor_null.cc', - 'base/cursor/cursor_loader_null.cc', - 'base/cursor/cursor_loader_null.h', - ], - }], ['toolkit_views==0', { 'sources!': [ 'base/dragdrop/drop_target_event.cc', |