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

Side by Side Diff: content/content.gyp

Issue 759433002: Reland: Move TouchSelectionController from content to ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed reviewers' comments Created 6 years 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
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, # Use higher warning level. 7 'chromium_code': 1, # Use higher warning level.
8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine. 8 'chromium_enable_vtune_jit_for_v8%': 0, # enable the vtune support for V8 e ngine.
9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' , 9 'directxsdk_exists': '<!pymod_do_main(dir_exists ../third_party/directxsdk)' ,
10 }, 10 },
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 'type': 'none', 436 'type': 'none',
437 'dependencies': [ 437 'dependencies': [
438 '../base/base.gyp:base', 438 '../base/base.gyp:base',
439 '../device/battery/battery.gyp:device_battery_java', 439 '../device/battery/battery.gyp:device_battery_java',
440 '../media/media.gyp:media_java', 440 '../media/media.gyp:media_java',
441 '../mojo/mojo_base.gyp:mojo_system_java', 441 '../mojo/mojo_base.gyp:mojo_system_java',
442 '../mojo/public/mojo_public.gyp:mojo_application_bindings', 442 '../mojo/public/mojo_public.gyp:mojo_application_bindings',
443 '../mojo/public/mojo_public.gyp:mojo_bindings_java', 443 '../mojo/public/mojo_public.gyp:mojo_bindings_java',
444 '../net/net.gyp:net', 444 '../net/net.gyp:net',
445 '../ui/android/ui_android.gyp:ui_java', 445 '../ui/android/ui_android.gyp:ui_java',
446 '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_j ava',
446 'common_aidl', 447 'common_aidl',
447 'content_common', 448 'content_common',
448 'content_strings_grd', 449 'content_strings_grd',
449 'content_gamepad_mapping', 450 'content_gamepad_mapping',
450 'gesture_event_type_java', 451 'gesture_event_type_java',
451 'popup_item_type_java', 452 'popup_item_type_java',
452 'result_codes_java', 453 'result_codes_java',
453 'selection_event_type_java',
454 'speech_recognition_error_java', 454 'speech_recognition_error_java',
455 'top_controls_state_java', 455 'top_controls_state_java',
456 'screen_orientation_values_java', 456 'screen_orientation_values_java',
457 ], 457 ],
458 'variables': { 458 'variables': {
459 'java_in_dir': '../content/public/android/java', 459 'java_in_dir': '../content/public/android/java',
460 'has_java_resources': 1, 460 'has_java_resources': 1,
461 'R_package': 'org.chromium.content', 461 'R_package': 'org.chromium.content',
462 'R_package_relpath': 'org/chromium/content', 462 'R_package_relpath': 'org/chromium/content',
463 }, 463 },
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 }, 508 },
509 { 509 {
510 'target_name': 'result_codes_java', 510 'target_name': 'result_codes_java',
511 'type': 'none', 511 'type': 'none',
512 'variables': { 512 'variables': {
513 'source_file': 'public/common/result_codes.h', 513 'source_file': 'public/common/result_codes.h',
514 }, 514 },
515 'includes': [ '../build/android/java_cpp_enum.gypi' ], 515 'includes': [ '../build/android/java_cpp_enum.gypi' ],
516 }, 516 },
517 { 517 {
518 'target_name': 'selection_event_type_java',
519 'type': 'none',
520 'variables': {
521 'source_file': 'browser/renderer_host/input/selection_event_type.h',
522 },
523 'includes': [ '../build/android/java_cpp_enum.gypi' ],
524 },
525 {
526 'target_name': 'speech_recognition_error_java', 518 'target_name': 'speech_recognition_error_java',
527 'type': 'none', 519 'type': 'none',
528 'variables': { 520 'variables': {
529 'source_file': 'public/common/speech_recognition_error.h', 521 'source_file': 'public/common/speech_recognition_error.h',
530 }, 522 },
531 'includes': [ '../build/android/java_cpp_enum.gypi' ], 523 'includes': [ '../build/android/java_cpp_enum.gypi' ],
532 }, 524 },
533 { 525 {
534 'target_name': 'top_controls_state_java', 526 'target_name': 'top_controls_state_java',
535 'type': 'none', 527 'type': 'none',
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
603 ], 595 ],
604 }, 596 },
605 ], 597 ],
606 }], 598 }],
607 ], 599 ],
608 }, 600 },
609 ], 601 ],
610 }], # OS == "android" 602 }], # OS == "android"
611 ], 603 ],
612 } 604 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698