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

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: Updated WebsiteSettingsPopupLegacy to reflect latest changes to file 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 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 { 576 {
577 'targets': [ 577 'targets': [
578 { 578 {
579 'target_name': 'chrome_java', 579 'target_name': 'chrome_java',
580 'type': 'none', 580 'type': 'none',
581 'dependencies': [ 581 'dependencies': [
582 'activity_type_ids_java', 582 'activity_type_ids_java',
583 'app_banner_metrics_ids_java', 583 'app_banner_metrics_ids_java',
584 'chrome_resources.gyp:chrome_strings', 584 'chrome_resources.gyp:chrome_strings',
585 'chrome_strings_grd', 585 'chrome_strings_grd',
586 'page_info_connection_type_java',
586 'profile_sync_service_model_type_selection_java', 587 'profile_sync_service_model_type_selection_java',
587 'resource_id_java', 588 'resource_id_java',
588 'toolbar_model_security_levels_java', 589 'toolbar_model_security_levels_java',
589 'tab_load_status_java', 590 'tab_load_status_java',
590 '../base/base.gyp:base', 591 '../base/base.gyp:base',
591 '../components/components.gyp:bookmarks_java', 592 '../components/components.gyp:bookmarks_java',
592 '../components/components.gyp:dom_distiller_core_java', 593 '../components/components.gyp:dom_distiller_core_java',
593 '../components/components.gyp:gcm_driver_java', 594 '../components/components.gyp:gcm_driver_java',
594 '../components/components.gyp:navigation_interception_java', 595 '../components/components.gyp:navigation_interception_java',
595 '../components/components.gyp:sessions', 596 '../components/components.gyp:sessions',
(...skipping 22 matching lines...) Expand all
618 { 619 {
619 'target_name': 'chrome_strings_grd', 620 'target_name': 'chrome_strings_grd',
620 'type': 'none', 621 'type': 'none',
621 'variables': { 622 'variables': {
622 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 623 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
623 }, 624 },
624 'includes': [ 625 'includes': [
625 '../build/java_strings_grd.gypi', 626 '../build/java_strings_grd.gypi',
626 ], 627 ],
627 }, 628 },
629 {
630 'target_name': 'page_info_connection_type_java',
631 'type': 'none',
632 'variables': {
633 'source_file': 'browser/ui/android/website_settings_popup_android.h' ,
634 },
635 'includes': [ '../build/android/java_cpp_enum.gypi' ],
636 },
628 ], # 'targets' 637 ], # 'targets'
629 'includes': [ 638 'includes': [
630 'chrome_android.gypi', 639 'chrome_android.gypi',
631 ]}, # 'includes' 640 ]}, # 'includes'
632 ], # OS=="android" 641 ], # OS=="android"
633 ['configuration_policy==1 and OS!="android" and OS!="ios"', { 642 ['configuration_policy==1 and OS!="android" and OS!="ios"', {
634 'includes': [ 'policy.gypi', ], 643 'includes': [ 'policy.gypi', ],
635 }], 644 }],
636 ['enable_extensions==1', { 645 ['enable_extensions==1', {
637 'includes': [ 646 'includes': [
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
723 'service/service_utility_process_host.cc', 732 'service/service_utility_process_host.cc',
724 'service/service_utility_process_host.h', 733 'service/service_utility_process_host.h',
725 ], 734 ],
726 }], 735 }],
727 ], 736 ],
728 }, 737 },
729 ], 738 ],
730 }], 739 }],
731 ], # 'conditions' 740 ], # 'conditions'
732 } 741 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698