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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 9 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
« ui/aura/cursor.h ('K') | « webkit/glue/webcursor_aurax11.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 'conditions': [ 7 'conditions': [
8 ['inside_chromium_build==0', { 8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..', 9 'webkit_src_dir': '../../../../..',
10 },{ 10 },{
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 'webaccessibility.cc', 398 'webaccessibility.cc',
399 'webaccessibility.h', 399 'webaccessibility.h',
400 'webclipboard_impl.cc', 400 'webclipboard_impl.cc',
401 'webclipboard_impl.h', 401 'webclipboard_impl.h',
402 'webcookie.cc', 402 'webcookie.cc',
403 'webcookie.h', 403 'webcookie.h',
404 'webcursor.cc', 404 'webcursor.cc',
405 'webcursor.h', 405 'webcursor.h',
406 'webcursor_android.cc', 406 'webcursor_android.cc',
407 'webcursor_aura.cc', 407 'webcursor_aura.cc',
408 'webcursor_aurawin.cc',
409 'webcursor_aurax11.cc',
408 'webcursor_gtk.cc', 410 'webcursor_gtk.cc',
409 'webcursor_gtk_data.h', 411 'webcursor_gtk_data.h',
410 'webcursor_mac.mm', 412 'webcursor_mac.mm',
411 'webcursor_win.cc', 413 'webcursor_win.cc',
412 'webdropdata.cc', 414 'webdropdata.cc',
413 'webdropdata_win.cc', 415 'webdropdata_win.cc',
414 'webdropdata.h', 416 'webdropdata.h',
415 'webfileutilities_impl.cc', 417 'webfileutilities_impl.cc',
416 'webfileutilities_impl.h', 418 'webfileutilities_impl.h',
417 'webkit_constants.h', 419 'webkit_constants.h',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 'conditions': [ 485 'conditions': [
484 ['linux_use_tcmalloc == 1', { 486 ['linux_use_tcmalloc == 1', {
485 'dependencies': [ 487 'dependencies': [
486 # This is needed by ../extensions/v8/heap_profiler_extension.cc 488 # This is needed by ../extensions/v8/heap_profiler_extension.cc
487 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 489 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
488 ], 490 ],
489 }], 491 }],
490 ], 492 ],
491 }], 493 }],
492 ['use_aura==1', { 494 ['use_aura==1', {
495 'dependencies': [
496 '<(DEPTH)/ui/aura/aura.gyp:aura',
497 ],
493 'sources/': [ 498 'sources/': [
494 ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_mac.mm'], 499 ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_mac.mm'],
495 ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_win.cc'], 500 ['exclude', '^\\.\\./plugins/npapi/webplugin_delegate_impl_win.cc'],
496 ], 501 ],
497 'sources!': [ 502 'sources!': [
498 'webcursor_mac.mm', 503 'webcursor_mac.mm',
499 'webcursor_win.cc', 504 'webcursor_win.cc',
500 ], 505 ],
501 }], 506 }],
507 ['use_aura==1 and use_x11==1', {
508 'link_settings': {
509 'libraries': [ '-lXcursor', ],
510 },
511 }],
502 ['OS!="mac"', { 512 ['OS!="mac"', {
503 'sources/': [['exclude', '_mac\\.(cc|mm)$']], 513 'sources/': [['exclude', '_mac\\.(cc|mm)$']],
504 'sources!': [ 514 'sources!': [
505 'webthemeengine_impl_mac.cc', 515 'webthemeengine_impl_mac.cc',
506 ], 516 ],
507 }, { # else: OS=="mac" 517 }, { # else: OS=="mac"
508 'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']], 518 'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
509 'link_settings': { 519 'link_settings': {
510 'libraries': [ 520 'libraries': [
511 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', 521 '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 }, 585 },
576 'includes': [ '../../build/grit_action.gypi' ], 586 'includes': [ '../../build/grit_action.gypi' ],
577 }, 587 },
578 ], 588 ],
579 'includes': [ '../../build/grit_target.gypi' ], 589 'includes': [ '../../build/grit_target.gypi' ],
580 }, 590 },
581 ], 591 ],
582 }], 592 }],
583 ], 593 ],
584 } 594 }
OLDNEW
« ui/aura/cursor.h ('K') | « webkit/glue/webcursor_aurax11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698