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

Side by Side Diff: chrome/chrome.gyp

Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small review feedback Created 6 years, 2 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
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 'targets': [ 578 'targets': [
579 { 579 {
580 'target_name': 'chrome_java', 580 'target_name': 'chrome_java',
581 'type': 'none', 581 'type': 'none',
582 'dependencies': [ 582 'dependencies': [
583 'activity_type_ids_java', 583 'activity_type_ids_java',
584 'app_banner_metrics_ids_java', 584 'app_banner_metrics_ids_java',
585 'chrome_resources.gyp:chrome_strings', 585 'chrome_resources.gyp:chrome_strings',
586 'chrome_strings_grd', 586 'chrome_strings_grd',
587 'profile_account_management_metrics_java', 587 'profile_account_management_metrics_java',
588 'page_info_connection_type_java',
588 'profile_sync_service_model_type_selection_java', 589 'profile_sync_service_model_type_selection_java',
589 'resource_id_java', 590 'resource_id_java',
590 'toolbar_model_security_levels_java', 591 'toolbar_model_security_levels_java',
591 'tab_load_status_java', 592 'tab_load_status_java',
592 '../base/base.gyp:base', 593 '../base/base.gyp:base',
593 '../components/components.gyp:bookmarks_java', 594 '../components/components.gyp:bookmarks_java',
594 '../components/components.gyp:dom_distiller_core_java', 595 '../components/components.gyp:dom_distiller_core_java',
595 '../components/components.gyp:gcm_driver_java', 596 '../components/components.gyp:gcm_driver_java',
596 '../components/components.gyp:invalidation_java', 597 '../components/components.gyp:invalidation_java',
597 '../components/components.gyp:navigation_interception_java', 598 '../components/components.gyp:navigation_interception_java',
(...skipping 23 matching lines...) Expand all
621 { 622 {
622 'target_name': 'chrome_strings_grd', 623 'target_name': 'chrome_strings_grd',
623 'type': 'none', 624 'type': 'none',
624 'variables': { 625 'variables': {
625 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 626 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
626 }, 627 },
627 'includes': [ 628 'includes': [
628 '../build/java_strings_grd.gypi', 629 '../build/java_strings_grd.gypi',
629 ], 630 ],
630 }, 631 },
632 {
633 'target_name': 'page_info_connection_type_java',
634 'type': 'none',
635 'variables': {
636 'source_file': 'browser/ui/android/website_settings_popup_android.h' ,
637 },
638 'includes': [ '../build/android/java_cpp_enum.gypi' ],
639 },
631 ], # 'targets' 640 ], # 'targets'
632 'includes': [ 641 'includes': [
633 'chrome_android.gypi', 642 'chrome_android.gypi',
634 ]}, # 'includes' 643 ]}, # 'includes'
635 ], # OS=="android" 644 ], # OS=="android"
636 ['configuration_policy==1 and OS!="android" and OS!="ios"', { 645 ['configuration_policy==1 and OS!="android" and OS!="ios"', {
637 'includes': [ 'policy.gypi', ], 646 'includes': [ 'policy.gypi', ],
638 }], 647 }],
639 ['enable_extensions==1', { 648 ['enable_extensions==1', {
640 'includes': [ 649 'includes': [
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 'service/service_utility_process_host.cc', 735 'service/service_utility_process_host.cc',
727 'service/service_utility_process_host.h', 736 'service/service_utility_process_host.h',
728 ], 737 ],
729 }], 738 }],
730 ], 739 ],
731 }, 740 },
732 ], 741 ],
733 }], 742 }],
734 ], # 'conditions' 743 ], # 'conditions'
735 } 744 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698