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

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: 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
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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 { 629 {
630 'targets': [ 630 'targets': [
631 { 631 {
632 'target_name': 'chrome_java', 632 'target_name': 'chrome_java',
633 'type': 'none', 633 'type': 'none',
634 'dependencies': [ 634 'dependencies': [
635 'activity_type_ids_java', 635 'activity_type_ids_java',
636 'app_banner_metrics_ids_java', 636 'app_banner_metrics_ids_java',
637 'chrome_resources.gyp:chrome_strings', 637 'chrome_resources.gyp:chrome_strings',
638 'chrome_strings_grd', 638 'chrome_strings_grd',
639 'page_info_connection_type_java',
639 'profile_sync_service_model_type_selection_java', 640 'profile_sync_service_model_type_selection_java',
640 'resource_id_java', 641 'resource_id_java',
641 'toolbar_model_security_levels_java', 642 'toolbar_model_security_levels_java',
642 'tab_load_status_java', 643 'tab_load_status_java',
643 '../base/base.gyp:base', 644 '../base/base.gyp:base',
644 '../components/components.gyp:bookmarks_java', 645 '../components/components.gyp:bookmarks_java',
645 '../components/components.gyp:dom_distiller_core_java', 646 '../components/components.gyp:dom_distiller_core_java',
646 '../components/components.gyp:enhanced_bookmarks_java', 647 '../components/components.gyp:enhanced_bookmarks_java',
647 '../components/components.gyp:gcm_driver_java', 648 '../components/components.gyp:gcm_driver_java',
648 '../components/components.gyp:navigation_interception_java', 649 '../components/components.gyp:navigation_interception_java',
(...skipping 23 matching lines...) Expand all
672 { 673 {
673 'target_name': 'chrome_strings_grd', 674 'target_name': 'chrome_strings_grd',
674 'type': 'none', 675 'type': 'none',
675 'variables': { 676 'variables': {
676 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 677 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
677 }, 678 },
678 'includes': [ 679 'includes': [
679 '../build/java_strings_grd.gypi', 680 '../build/java_strings_grd.gypi',
680 ], 681 ],
681 }, 682 },
683 {
684 'target_name': 'page_info_connection_type_java',
cjhopman 2014/09/25 21:17:52 This will need to be added to GN eventually, but c
sashab 2014/09/29 04:17:12 In that case, this won't build with GN at all. The
685 'type': 'none',
686 'variables': {
687 'source_file': 'browser/ui/android/website_settings_popup_android.h' ,
688 },
689 'includes': [ '../build/android/java_cpp_enum.gypi' ],
690 },
682 ], # 'targets' 691 ], # 'targets'
683 'includes': [ 692 'includes': [
684 'chrome_android.gypi', 693 'chrome_android.gypi',
685 ]}, # 'includes' 694 ]}, # 'includes'
686 ], # OS=="android" 695 ], # OS=="android"
687 ['configuration_policy==1 and OS!="android" and OS!="ios"', { 696 ['configuration_policy==1 and OS!="android" and OS!="ios"', {
688 'includes': [ 'policy.gypi', ], 697 'includes': [ 'policy.gypi', ],
689 }], 698 }],
690 ['enable_extensions==1', { 699 ['enable_extensions==1', {
691 'includes': [ 700 'includes': [
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 'service/service_utility_process_host.cc', 786 'service/service_utility_process_host.cc',
778 'service/service_utility_process_host.h', 787 'service/service_utility_process_host.h',
779 ], 788 ],
780 }], 789 }],
781 ], 790 ],
782 }, 791 },
783 ], 792 ],
784 }], 793 }],
785 ], # 'conditions' 794 ], # 'conditions'
786 } 795 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698