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

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: Added TODO to rename class to PageInfo 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 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
577 { 577 {
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 'content_settings_type_java',
588 'page_info_connection_type_java',
587 'profile_account_management_metrics_java', 589 'profile_account_management_metrics_java',
588 'page_info_connection_type_java',
589 'profile_sync_service_model_type_selection_java', 590 'profile_sync_service_model_type_selection_java',
590 'resource_id_java', 591 'resource_id_java',
591 'toolbar_model_security_levels_java', 592 'toolbar_model_security_levels_java',
592 'tab_load_status_java', 593 'tab_load_status_java',
593 '../base/base.gyp:base', 594 '../base/base.gyp:base',
594 '../components/components.gyp:bookmarks_java', 595 '../components/components.gyp:bookmarks_java',
595 '../components/components.gyp:dom_distiller_core_java', 596 '../components/components.gyp:dom_distiller_core_java',
596 '../components/components.gyp:gcm_driver_java', 597 '../components/components.gyp:gcm_driver_java',
597 '../components/components.gyp:invalidation_java', 598 '../components/components.gyp:invalidation_java',
598 '../components/components.gyp:navigation_interception_java', 599 '../components/components.gyp:navigation_interception_java',
(...skipping 24 matching lines...) Expand all
623 'target_name': 'chrome_strings_grd', 624 'target_name': 'chrome_strings_grd',
624 'type': 'none', 625 'type': 'none',
625 'variables': { 626 'variables': {
626 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd', 627 'grd_file': '../chrome/android/java/strings/android_chrome_strings.g rd',
627 }, 628 },
628 'includes': [ 629 'includes': [
629 '../build/java_strings_grd.gypi', 630 '../build/java_strings_grd.gypi',
630 ], 631 ],
631 }, 632 },
632 { 633 {
634 'target_name': 'content_settings_type_java',
635 'type': 'none',
636 'variables': {
637 'source_file': '../components/content_settings/core/common/content_s ettings_types.h',
638 },
639 'includes': [ '../build/android/java_cpp_enum.gypi' ],
640 },
641 {
633 'target_name': 'page_info_connection_type_java', 642 'target_name': 'page_info_connection_type_java',
634 'type': 'none', 643 'type': 'none',
635 'variables': { 644 'variables': {
636 'source_file': 'browser/ui/android/website_settings_popup_android.h' , 645 'source_file': 'browser/ui/android/website_settings_popup_android.h' ,
637 }, 646 },
638 'includes': [ '../build/android/java_cpp_enum.gypi' ], 647 'includes': [ '../build/android/java_cpp_enum.gypi' ],
639 }, 648 },
640 ], # 'targets' 649 ], # 'targets'
641 'includes': [ 650 'includes': [
642 'chrome_android.gypi', 651 'chrome_android.gypi',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 'service/service_utility_process_host.cc', 744 'service/service_utility_process_host.cc',
736 'service/service_utility_process_host.h', 745 'service/service_utility_process_host.h',
737 ], 746 ],
738 }], 747 }],
739 ], 748 ],
740 }, 749 },
741 ], 750 ],
742 }], 751 }],
743 ], # 'conditions' 752 ], # 'conditions'
744 } 753 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698