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

Side by Side Diff: ui/base/ui_base.gyp

Issue 248893002: MacViews: gyp changes for a non-aura toolkit views on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase for r265571 conflict, less similarity Created 6 years, 8 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
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_mac.mm ('k') | ui/gfx/gfx.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 'device_form_factor.h', 146 'device_form_factor.h',
147 'dragdrop/cocoa_dnd_util.h', 147 'dragdrop/cocoa_dnd_util.h',
148 'dragdrop/cocoa_dnd_util.mm', 148 'dragdrop/cocoa_dnd_util.mm',
149 'dragdrop/drag_drop_types.h', 149 'dragdrop/drag_drop_types.h',
150 'dragdrop/drag_drop_types_win.cc', 150 'dragdrop/drag_drop_types_win.cc',
151 'dragdrop/drag_source_win.cc', 151 'dragdrop/drag_source_win.cc',
152 'dragdrop/drag_source_win.h', 152 'dragdrop/drag_source_win.h',
153 'dragdrop/drag_utils.cc', 153 'dragdrop/drag_utils.cc',
154 'dragdrop/drag_utils.h', 154 'dragdrop/drag_utils.h',
155 'dragdrop/drag_utils_aura.cc', 155 'dragdrop/drag_utils_aura.cc',
156 'dragdrop/drag_utils_mac.mm',
156 'dragdrop/drag_utils_win.cc', 157 'dragdrop/drag_utils_win.cc',
157 'dragdrop/drop_target_event.cc', 158 'dragdrop/drop_target_event.cc',
158 'dragdrop/drop_target_event.h', 159 'dragdrop/drop_target_event.h',
159 'dragdrop/drop_target_win.cc', 160 'dragdrop/drop_target_win.cc',
160 'dragdrop/drop_target_win.h', 161 'dragdrop/drop_target_win.h',
161 'dragdrop/file_info.cc', 162 'dragdrop/file_info.cc',
162 'dragdrop/file_info.h', 163 'dragdrop/file_info.h',
163 'dragdrop/os_exchange_data.cc', 164 'dragdrop/os_exchange_data.cc',
164 'dragdrop/os_exchange_data.h', 165 'dragdrop/os_exchange_data.h',
165 'dragdrop/os_exchange_data_provider_aura.cc', 166 'dragdrop/os_exchange_data_provider_aura.cc',
166 'dragdrop/os_exchange_data_provider_aura.h', 167 'dragdrop/os_exchange_data_provider_aura.h',
167 'dragdrop/os_exchange_data_provider_aurax11.cc', 168 'dragdrop/os_exchange_data_provider_aurax11.cc',
168 'dragdrop/os_exchange_data_provider_aurax11.h', 169 'dragdrop/os_exchange_data_provider_aurax11.h',
170 'dragdrop/os_exchange_data_provider_mac.mm',
169 'dragdrop/os_exchange_data_provider_win.cc', 171 'dragdrop/os_exchange_data_provider_win.cc',
170 'dragdrop/os_exchange_data_provider_win.h', 172 'dragdrop/os_exchange_data_provider_win.h',
171 'hit_test.h', 173 'hit_test.h',
172 'l10n/formatter.cc', 174 'l10n/formatter.cc',
173 'l10n/formatter.h', 175 'l10n/formatter.h',
174 'l10n/l10n_font_util.cc', 176 'l10n/l10n_font_util.cc',
175 'l10n/l10n_font_util.h', 177 'l10n/l10n_font_util.h',
176 'l10n/l10n_util.cc', 178 'l10n/l10n_util.cc',
177 'l10n/l10n_util.h', 179 'l10n/l10n_util.h',
178 'l10n/l10n_util_android.cc', 180 'l10n/l10n_util_android.cc',
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 ], 349 ],
348 }, { # use_aura!=1 350 }, { # use_aura!=1
349 'sources!': [ 351 'sources!': [
350 'cursor/cursor.cc', 352 'cursor/cursor.cc',
351 'cursor/cursor.h', 353 'cursor/cursor.h',
352 'cursor/cursor_loader_x11.cc', 354 'cursor/cursor_loader_x11.cc',
353 'cursor/cursor_loader_x11.h', 355 'cursor/cursor_loader_x11.h',
354 'cursor/cursor_mac.mm', 356 'cursor/cursor_mac.mm',
355 'cursor/cursor_win.cc', 357 'cursor/cursor_win.cc',
356 'cursor/cursor_x11.cc', 358 'cursor/cursor_x11.cc',
357 'nine_image_painter_factory.cc',
358 'nine_image_painter_factory.h',
359 'x/selection_owner.cc', 359 'x/selection_owner.cc',
360 'x/selection_owner.h', 360 'x/selection_owner.h',
361 'x/selection_requestor.cc', 361 'x/selection_requestor.cc',
362 'x/selection_requestor.h', 362 'x/selection_requestor.h',
363 'x/selection_utils.cc', 363 'x/selection_utils.cc',
364 'x/selection_utils.h', 364 'x/selection_utils.h',
365 ] 365 ]
366 }], 366 }],
367 ['use_aura==0 or OS!="linux"', { 367 ['use_aura==0 or OS!="linux"', {
368 'sources!': [ 368 'sources!': [
(...skipping 12 matching lines...) Expand all
381 ], 381 ],
382 }], 382 }],
383 ['desktop_linux == 1 or chromeos == 1', { 383 ['desktop_linux == 1 or chromeos == 1', {
384 'conditions': [ 384 'conditions': [
385 ['toolkit_views==0 and use_aura==0', { 385 ['toolkit_views==0 and use_aura==0', {
386 # Note: because of gyp predence rules this has to be defined as 386 # Note: because of gyp predence rules this has to be defined as
387 # 'sources/' rather than 'sources!'. 387 # 'sources/' rather than 'sources!'.
388 'sources/': [ 388 'sources/': [
389 ['exclude', '^dragdrop/drag_utils.cc'], 389 ['exclude', '^dragdrop/drag_utils.cc'],
390 ['exclude', '^dragdrop/drag_utils.h'], 390 ['exclude', '^dragdrop/drag_utils.h'],
391 ['exclude', '^dragdrop/os_exchange_data.cc'],
392 ['exclude', '^dragdrop/os_exchange_data.h'],
393 ],
394 }, {
395 # Note: because of gyp predence rules this has to be defined as
396 # 'sources/' rather than 'sources!'.
397 'sources/': [
398 ['include', '^dragdrop/os_exchange_data.cc'],
399 ], 391 ],
400 }], 392 }],
401 ], 393 ],
402 }], 394 }],
403 ['use_pango==1', { 395 ['use_pango==1', {
404 'dependencies': [ 396 'dependencies': [
405 '../../build/linux/system.gyp:pangocairo', 397 '../../build/linux/system.gyp:pangocairo',
406 ], 398 ],
407 }], 399 }],
408 ['OS=="win" or use_clipboard_aurax11==1', { 400 ['OS=="win" or use_clipboard_aurax11==1', {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 }, 454 },
463 },{ # OS!="win" 455 },{ # OS!="win"
464 'conditions': [ 456 'conditions': [
465 ['use_aura==0', { 457 ['use_aura==0', {
466 'sources!': [ 458 'sources!': [
467 'view_prop.cc', 459 'view_prop.cc',
468 'view_prop.h', 460 'view_prop.h',
469 ], 461 ],
470 }], 462 }],
471 ], 463 ],
472 'sources!': [
473 'dragdrop/drag_drop_types.h',
474 'dragdrop/os_exchange_data.cc',
475 ],
476 }], 464 }],
477 ['OS=="mac"', { 465 ['OS=="mac"', {
478 'dependencies': [ 466 'dependencies': [
479 '../../third_party/mozilla/mozilla.gyp:mozilla', 467 '../../third_party/mozilla/mozilla.gyp:mozilla',
480 ], 468 ],
481 'sources!': [ 469 'sources!': [
482 'dragdrop/drag_utils.cc', 470 'dragdrop/drag_utils.cc',
483 'dragdrop/drag_utils.h', 471 'dragdrop/drag_utils.h',
484 ], 472 ],
485 'link_settings': { 473 'link_settings': {
(...skipping 13 matching lines...) Expand all
499 'dependencies': [ 487 'dependencies': [
500 '../../build/linux/system.gyp:x11', 488 '../../build/linux/system.gyp:x11',
501 '../../build/linux/system.gyp:xcursor', 489 '../../build/linux/system.gyp:xcursor',
502 '../../build/linux/system.gyp:xext', 490 '../../build/linux/system.gyp:xext',
503 '../../build/linux/system.gyp:xfixes', 491 '../../build/linux/system.gyp:xfixes',
504 '../../build/linux/system.gyp:xrender', # For XRender* function cal ls in x11_util.cc. 492 '../../build/linux/system.gyp:xrender', # For XRender* function cal ls in x11_util.cc.
505 ], 493 ],
506 }], 494 }],
507 ['toolkit_views==0', { 495 ['toolkit_views==0', {
508 'sources!': [ 496 'sources!': [
497 'dragdrop/drag_drop_types.h',
509 'dragdrop/drop_target_event.cc', 498 'dragdrop/drop_target_event.cc',
510 'dragdrop/drop_target_event.h', 499 'dragdrop/drop_target_event.h',
500 'dragdrop/os_exchange_data.cc',
501 'dragdrop/os_exchange_data.h',
502 'nine_image_painter_factory.cc',
503 'nine_image_painter_factory.h',
511 ], 504 ],
512 }], 505 }],
513 ['OS=="android"', { 506 ['OS=="android"', {
514 'sources!': [ 507 'sources!': [
515 'default_theme_provider.cc', 508 'default_theme_provider.cc',
516 'dragdrop/drag_utils.cc', 509 'dragdrop/drag_utils.cc',
517 'dragdrop/drag_utils.h', 510 'dragdrop/drag_utils.h',
518 'l10n/l10n_font_util.cc', 511 'l10n/l10n_font_util.cc',
519 'models/button_menu_item_model.cc', 512 'models/button_menu_item_model.cc',
520 'models/dialog_model.cc', 513 'models/dialog_model.cc',
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 'variables': { 617 'variables': {
625 'jni_gen_package': 'ui', 618 'jni_gen_package': 'ui',
626 'jni_generator_ptr_type': 'long', 619 'jni_generator_ptr_type': 'long',
627 }, 620 },
628 'includes': [ '../../build/jni_generator.gypi' ], 621 'includes': [ '../../build/jni_generator.gypi' ],
629 }, 622 },
630 ], 623 ],
631 }], 624 }],
632 ], 625 ],
633 } 626 }
OLDNEW
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_mac.mm ('k') | ui/gfx/gfx.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698