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

Side by Side Diff: content/content.gyp

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
« no previous file with comments | « content/common/resource_messages.h ('k') | content/content_common.gypi » ('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 (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 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 'dependencies': [ 422 'dependencies': [
423 '../base/base.gyp:base', 423 '../base/base.gyp:base',
424 '../media/media.gyp:media_java', 424 '../media/media.gyp:media_java',
425 '../net/net.gyp:net', 425 '../net/net.gyp:net',
426 '../ui/android/ui_android.gyp:ui_java', 426 '../ui/android/ui_android.gyp:ui_java',
427 'common_aidl', 427 'common_aidl',
428 'content_common', 428 'content_common',
429 'content_strings_grd', 429 'content_strings_grd',
430 'content_gamepad_mapping', 430 'content_gamepad_mapping',
431 'gesture_event_type_java', 431 'gesture_event_type_java',
432 'page_transition_types_java',
433 'popup_item_type_java', 432 'popup_item_type_java',
434 'result_codes_java', 433 'result_codes_java',
435 'selection_event_type_java', 434 'selection_event_type_java',
436 'speech_recognition_error_java', 435 'speech_recognition_error_java',
437 'top_controls_state_java', 436 'top_controls_state_java',
438 'screen_orientation_values_java', 437 'screen_orientation_values_java',
439 ], 438 ],
440 'variables': { 439 'variables': {
441 'java_in_dir': '../content/public/android/java', 440 'java_in_dir': '../content/public/android/java',
442 'has_java_resources': 1, 441 'has_java_resources': 1,
(...skipping 27 matching lines...) Expand all
470 'sources': [ 469 'sources': [
471 'public/android/java/src/org/chromium/content/browser/GestureEventTy pe.template', 470 'public/android/java/src/org/chromium/content/browser/GestureEventTy pe.template',
472 ], 471 ],
473 'variables': { 472 'variables': {
474 'package_name': 'org/chromium/content/browser', 473 'package_name': 'org/chromium/content/browser',
475 'template_deps': ['browser/android/gesture_event_type_list.h'], 474 'template_deps': ['browser/android/gesture_event_type_list.h'],
476 }, 475 },
477 'includes': [ '../build/android/java_cpp_template.gypi' ], 476 'includes': [ '../build/android/java_cpp_template.gypi' ],
478 }, 477 },
479 { 478 {
480 'target_name': 'page_transition_types_java',
481 'type': 'none',
482 'sources': [
483 'public/android/java/src/org/chromium/content_public/browser/PageTra nsitionTypes.template',
484 ],
485 'variables': {
486 'package_name': 'org/chromium/content_public/browser',
487 'template_deps': ['public/common/page_transition_types_list.h'],
488 },
489 'includes': [ '../build/android/java_cpp_template.gypi' ],
490 },
491 {
492 'target_name': 'popup_item_type_java', 479 'target_name': 'popup_item_type_java',
493 'type': 'none', 480 'type': 'none',
494 'sources': [ 481 'sources': [
495 'public/android/java/src/org/chromium/content/browser/input/PopupIte mType.template', 482 'public/android/java/src/org/chromium/content/browser/input/PopupIte mType.template',
496 ], 483 ],
497 'variables': { 484 'variables': {
498 'package_name': 'org/chromium/content/browser/input', 485 'package_name': 'org/chromium/content/browser/input',
499 'template_deps': ['browser/android/popup_item_type_list.h'], 486 'template_deps': ['browser/android/popup_item_type_list.h'],
500 }, 487 },
501 'includes': [ '../build/android/java_cpp_template.gypi' ], 488 'includes': [ '../build/android/java_cpp_template.gypi' ],
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 'browser/gamepad/canonical_axis_index_list.h', 603 'browser/gamepad/canonical_axis_index_list.h',
617 'browser/gamepad/canonical_button_index_list.h', 604 'browser/gamepad/canonical_button_index_list.h',
618 ], 605 ],
619 }, 606 },
620 'includes': [ '../build/android/java_cpp_template.gypi' ], 607 'includes': [ '../build/android/java_cpp_template.gypi' ],
621 }, 608 },
622 ], 609 ],
623 }], # OS == "android" 610 }], # OS == "android"
624 ], 611 ],
625 } 612 }
OLDNEW
« no previous file with comments | « content/common/resource_messages.h ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698