Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(320)

Side by Side Diff: ui/ui.gyp

Issue 158023006: Adding Ozone CursorLoader and necessary API functions to allow setting the cursor in SoftwareFactor… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 'base/cocoa/view_description.h', 122 'base/cocoa/view_description.h',
123 'base/cocoa/view_description.mm', 123 'base/cocoa/view_description.mm',
124 'base/cocoa/window_size_constants.h', 124 'base/cocoa/window_size_constants.h',
125 'base/cocoa/window_size_constants.mm', 125 'base/cocoa/window_size_constants.mm',
126 'base/cursor/cursor.cc', 126 'base/cursor/cursor.cc',
127 'base/cursor/cursor.h', 127 'base/cursor/cursor.h',
128 'base/cursor/cursor_android.cc', 128 'base/cursor/cursor_android.cc',
129 'base/cursor/cursor_loader.h', 129 'base/cursor/cursor_loader.h',
130 'base/cursor/cursor_loader_null.cc', 130 'base/cursor/cursor_loader_null.cc',
131 'base/cursor/cursor_loader_null.h', 131 'base/cursor/cursor_loader_null.h',
132 'base/cursor/cursor_loader_ozone.cc',
133 'base/cursor/cursor_loader_ozone.h',
132 'base/cursor/cursor_loader_win.cc', 134 'base/cursor/cursor_loader_win.cc',
133 'base/cursor/cursor_loader_win.h', 135 'base/cursor/cursor_loader_win.h',
134 'base/cursor/cursor_loader_x11.cc', 136 'base/cursor/cursor_loader_x11.cc',
135 'base/cursor/cursor_loader_x11.h', 137 'base/cursor/cursor_loader_x11.h',
136 'base/cursor/cursor_null.cc', 138 'base/cursor/cursor_null.cc',
139 'base/cursor/cursor_ozone.cc',
137 'base/cursor/cursor_mac.mm', 140 'base/cursor/cursor_mac.mm',
138 'base/cursor/cursor_win.cc', 141 'base/cursor/cursor_win.cc',
139 'base/cursor/cursor_x11.cc', 142 'base/cursor/cursor_x11.cc',
140 'base/cursor/cursors_aura.cc', 143 'base/cursor/cursors_aura.cc',
141 'base/cursor/cursors_aura.h', 144 'base/cursor/cursors_aura.h',
142 'base/default_theme_provider.cc', 145 'base/default_theme_provider.cc',
143 'base/default_theme_provider.h', 146 'base/default_theme_provider.h',
144 'base/default_theme_provider_mac.mm', 147 'base/default_theme_provider_mac.mm',
145 'base/device_form_factor_android.cc', 148 'base/device_form_factor_android.cc',
146 'base/device_form_factor_desktop.cc', 149 'base/device_form_factor_desktop.cc',
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 }, 542 },
540 }, 543 },
541 'dependencies': [ 544 'dependencies': [
542 '../build/linux/system.gyp:x11', 545 '../build/linux/system.gyp:x11',
543 '../build/linux/system.gyp:xcursor', 546 '../build/linux/system.gyp:xcursor',
544 '../build/linux/system.gyp:xext', 547 '../build/linux/system.gyp:xext',
545 '../build/linux/system.gyp:xfixes', 548 '../build/linux/system.gyp:xfixes',
546 '../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc. 549 '../build/linux/system.gyp:xrender', # For XRender* function calls in x11_util.cc.
547 ], 550 ],
548 }], 551 }],
549 ['use_ozone==0', { 552 ['OS=="android" or OS=="mac" or OS=="win" or use_ozone==1 or use_x11==1' , {
rjkroege 2014/02/11 21:57:55 what platforms continue to use cursor_null* with t
dnicoara 2014/02/12 16:18:19 Not sure if there are any left. I've removed the *
550 'sources!': [ 553 'sources!': [
551 'base/cursor/cursor_null.cc', 554 'base/cursor/cursor_null.cc',
552 'base/cursor/cursor_loader_null.cc', 555 'base/cursor/cursor_loader_null.cc',
553 'base/cursor/cursor_loader_null.h', 556 'base/cursor/cursor_loader_null.h',
554 ], 557 ],
555 }], 558 }],
556 ['toolkit_views==0', { 559 ['toolkit_views==0', {
557 'sources!': [ 560 'sources!': [
558 'base/dragdrop/drop_target_event.cc', 561 'base/dragdrop/drop_target_event.cc',
559 'base/dragdrop/drop_target_event.h', 562 'base/dragdrop/drop_target_event.h',
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 'variables': { 645 'variables': {
643 'jni_gen_package': 'ui', 646 'jni_gen_package': 'ui',
644 'jni_generator_ptr_type': 'long', 647 'jni_generator_ptr_type': 'long',
645 }, 648 },
646 'includes': [ '../build/jni_generator.gypi' ], 649 'includes': [ '../build/jni_generator.gypi' ],
647 }, 650 },
648 ], 651 ],
649 }], 652 }],
650 ], 653 ],
651 } 654 }
OLDNEW
« ui/base/cursor/cursor_loader_ozone.cc ('K') | « ui/gfx/ozone/surface_factory_ozone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698