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

Side by Side Diff: chrome/chrome.gyp

Issue 620983002: Add Permissions to the PageInfo dialog on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@page_info_dialog_shell_only_v2
Patch Set: Final rebase Created 6 years, 1 month 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 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 # GN: //chrome/android:chrome_java 580 # GN: //chrome/android:chrome_java
581 'target_name': 'chrome_java', 581 'target_name': 'chrome_java',
582 'type': 'none', 582 'type': 'none',
583 'dependencies': [ 583 'dependencies': [
584 'activity_type_ids_java', 584 'activity_type_ids_java',
585 'app_banner_metrics_ids_java', 585 'app_banner_metrics_ids_java',
586 'chrome_resources.gyp:chrome_strings', 586 'chrome_resources.gyp:chrome_strings',
587 'chrome_strings_grd', 587 'chrome_strings_grd',
588 'chrome_version_java', 588 'chrome_version_java',
589 'profile_account_management_metrics_java', 589 'profile_account_management_metrics_java',
590 'content_setting_java',
591 'content_settings_type_java',
590 'page_info_connection_type_java', 592 'page_info_connection_type_java',
591 'profile_sync_service_model_type_selection_java', 593 'profile_sync_service_model_type_selection_java',
592 'resource_id_java', 594 'resource_id_java',
593 'toolbar_model_security_levels_java', 595 'toolbar_model_security_levels_java',
594 'tab_load_status_java', 596 'tab_load_status_java',
595 '../base/base.gyp:base', 597 '../base/base.gyp:base',
596 '../components/components.gyp:bookmarks_java', 598 '../components/components.gyp:bookmarks_java',
597 '../components/components.gyp:dom_distiller_core_java', 599 '../components/components.gyp:dom_distiller_core_java',
598 '../components/components.gyp:gcm_driver_java', 600 '../components/components.gyp:gcm_driver_java',
599 '../components/components.gyp:invalidation_java', 601 '../components/components.gyp:invalidation_java',
(...skipping 25 matching lines...) Expand all
625 'target_name': 'chrome_strings_grd', 627 'target_name': 'chrome_strings_grd',
626 'type': 'none', 628 'type': 'none',
627 'variables': { 629 'variables': {
628 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 630 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
629 }, 631 },
630 'includes': [ 632 'includes': [
631 '../build/java_strings_grd.gypi', 633 '../build/java_strings_grd.gypi',
632 ], 634 ],
633 }, 635 },
634 { 636 {
637 # GN: //chrome:content_setting_javagen
638 'target_name': 'content_setting_java',
639 'type': 'none',
640 'variables': {
641 'source_file': '../components/content_settings/core/common/content_s ettings.h',
642 },
643 'includes': [ '../build/android/java_cpp_enum.gypi' ],
644 },
645 {
646 # GN: //chrome:content_settings_type_javagen
647 'target_name': 'content_settings_type_java',
648 'type': 'none',
649 'variables': {
650 'source_file': '../components/content_settings/core/common/content_s ettings_types.h',
651 },
652 'includes': [ '../build/android/java_cpp_enum.gypi' ],
653 },
654 {
635 # GN: //chrome:page_info_connection_type_javagen 655 # GN: //chrome:page_info_connection_type_javagen
636 'target_name': 'page_info_connection_type_java', 656 'target_name': 'page_info_connection_type_java',
637 'type': 'none', 657 'type': 'none',
638 'variables': { 658 'variables': {
639 'source_file': 'browser/ui/android/website_settings_popup_android.h' , 659 'source_file': 'browser/ui/android/website_settings_popup_android.h' ,
640 }, 660 },
641 'includes': [ '../build/android/java_cpp_enum.gypi' ], 661 'includes': [ '../build/android/java_cpp_enum.gypi' ],
642 }, 662 },
643 ], # 'targets' 663 ], # 'targets'
644 'includes': [ 664 'includes': [
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 'service/service_utility_process_host.cc', 758 'service/service_utility_process_host.cc',
739 'service/service_utility_process_host.h', 759 'service/service_utility_process_host.h',
740 ], 760 ],
741 }], 761 }],
742 ], 762 ],
743 }, 763 },
744 ], 764 ],
745 }], 765 }],
746 ], # 'conditions' 766 ], # 'conditions'
747 } 767 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698