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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 137623002: Let MetricsService know about some Android Activities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments on patch set 5 + a unit test Created 6 years, 11 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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 # * code below browser/chromeos 89 # * code below browser/chromeos
90 # * code below browser/extensions 90 # * code below browser/extensions
91 'browser/about_flags.cc', 91 'browser/about_flags.cc',
92 'browser/about_flags.h', 92 'browser/about_flags.h',
93 'browser/accessibility/accessibility_extension_api_constants.cc', 93 'browser/accessibility/accessibility_extension_api_constants.cc',
94 'browser/accessibility/accessibility_extension_api_constants.h', 94 'browser/accessibility/accessibility_extension_api_constants.h',
95 'browser/accessibility/accessibility_events.cc', 95 'browser/accessibility/accessibility_events.cc',
96 'browser/accessibility/accessibility_events.h', 96 'browser/accessibility/accessibility_events.h',
97 'browser/accessibility/invert_bubble_prefs.cc', 97 'browser/accessibility/invert_bubble_prefs.cc',
98 'browser/accessibility/invert_bubble_prefs.h', 98 'browser/accessibility/invert_bubble_prefs.h',
99 'browser/android/activity_type_id_list.h',
100 'browser/android/activity_type_ids.cc',
101 'browser/android/activity_type_ids.h',
99 'browser/android/bookmarks/managed_bookmarks_shim.cc', 102 'browser/android/bookmarks/managed_bookmarks_shim.cc',
100 'browser/android/bookmarks/managed_bookmarks_shim.h', 103 'browser/android/bookmarks/managed_bookmarks_shim.h',
101 'browser/android/bookmarks/bookmarks_bridge.cc', 104 'browser/android/bookmarks/bookmarks_bridge.cc',
102 'browser/android/bookmarks/bookmarks_bridge.h', 105 'browser/android/bookmarks/bookmarks_bridge.h',
103 'browser/android/bookmarks/partner_bookmarks_shim.cc', 106 'browser/android/bookmarks/partner_bookmarks_shim.cc',
104 'browser/android/bookmarks/partner_bookmarks_shim.h', 107 'browser/android/bookmarks/partner_bookmarks_shim.h',
105 'browser/android/chrome_jni_registrar.cc', 108 'browser/android/chrome_jni_registrar.cc',
106 'browser/android/chrome_jni_registrar.h', 109 'browser/android/chrome_jni_registrar.h',
107 'browser/android/chrome_startup_flags.cc', 110 'browser/android/chrome_startup_flags.cc',
108 'browser/android/chrome_startup_flags.h', 111 'browser/android/chrome_startup_flags.h',
(...skipping 1081 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 'browser/metrics/field_trial_synchronizer.h', 1193 'browser/metrics/field_trial_synchronizer.h',
1191 'browser/metrics/metric_event_duration_details.h', 1194 'browser/metrics/metric_event_duration_details.h',
1192 'browser/metrics/metrics_log.cc', 1195 'browser/metrics/metrics_log.cc',
1193 'browser/metrics/metrics_log.h', 1196 'browser/metrics/metrics_log.h',
1194 'browser/metrics/metrics_log_serializer.cc', 1197 'browser/metrics/metrics_log_serializer.cc',
1195 'browser/metrics/metrics_log_serializer.h', 1198 'browser/metrics/metrics_log_serializer.h',
1196 'browser/metrics/metrics_network_observer.cc', 1199 'browser/metrics/metrics_network_observer.cc',
1197 'browser/metrics/metrics_network_observer.h', 1200 'browser/metrics/metrics_network_observer.h',
1198 'browser/metrics/metrics_reporting_scheduler.cc', 1201 'browser/metrics/metrics_reporting_scheduler.cc',
1199 'browser/metrics/metrics_reporting_scheduler.h', 1202 'browser/metrics/metrics_reporting_scheduler.h',
1203 'browser/metrics/metrics_service_android.cc',
1200 'browser/metrics/metrics_service.cc', 1204 'browser/metrics/metrics_service.cc',
1201 'browser/metrics/metrics_service.h', 1205 'browser/metrics/metrics_service.h',
1202 'browser/metrics/perf_provider_chromeos.cc', 1206 'browser/metrics/perf_provider_chromeos.cc',
1203 'browser/metrics/perf_provider_chromeos.h', 1207 'browser/metrics/perf_provider_chromeos.h',
1204 'browser/metrics/thread_watcher.cc', 1208 'browser/metrics/thread_watcher.cc',
1205 'browser/metrics/thread_watcher.h', 1209 'browser/metrics/thread_watcher.h',
1206 'browser/metrics/time_ticks_experiment_win.cc', 1210 'browser/metrics/time_ticks_experiment_win.cc',
1207 'browser/metrics/time_ticks_experiment_win.h', 1211 'browser/metrics/time_ticks_experiment_win.h',
1208 'browser/metrics/tracking_synchronizer.cc', 1212 'browser/metrics/tracking_synchronizer.cc',
1209 'browser/metrics/tracking_synchronizer.h', 1213 'browser/metrics/tracking_synchronizer.h',
(...skipping 2441 matching lines...) Expand 10 before | Expand all | Expand 10 after
3651 'android/java/src/org/chromium/chrome/browser/invalidation/Invalidat ionController.java', 3655 'android/java/src/org/chromium/chrome/browser/invalidation/Invalidat ionController.java',
3652 'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.j ava' 3656 'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.j ava'
3653 ], 3657 ],
3654 'variables': { 3658 'variables': {
3655 'jni_gen_package': 'chrome', 3659 'jni_gen_package': 'chrome',
3656 'jni_generator_ptr_type': 'long', 3660 'jni_generator_ptr_type': 'long',
3657 }, 3661 },
3658 'includes': [ '../build/jni_generator.gypi' ], 3662 'includes': [ '../build/jni_generator.gypi' ],
3659 }, 3663 },
3660 { 3664 {
3665 'target_name': 'activity_type_ids_java',
3666 'type': 'none',
3667 'sources': [
3668 'android/java/ActivityTypeIds.template',
3669 ],
3670 'variables': {
3671 'package_name': 'org/chromium/chrome/browser',
3672 'template_deps': ['browser/android/activity_type_id_list.h'],
3673 },
3674 'includes': [ '../build/android/java_cpp_template.gypi' ],
3675 },
3676 {
3661 'target_name': 'resource_id_java', 3677 'target_name': 'resource_id_java',
3662 'type': 'none', 3678 'type': 'none',
3663 'sources': [ 3679 'sources': [
3664 'android/java/ResourceId.template', 3680 'android/java/ResourceId.template',
3665 ], 3681 ],
3666 'variables': { 3682 'variables': {
3667 'package_name': 'org/chromium/chrome/browser', 3683 'package_name': 'org/chromium/chrome/browser',
3668 'template_deps': ['browser/android/resource_id.h'], 3684 'template_deps': ['browser/android/resource_id.h'],
3669 }, 3685 },
3670 'includes': [ '../build/android/java_cpp_template.gypi' ], 3686 'includes': [ '../build/android/java_cpp_template.gypi' ],
(...skipping 20 matching lines...) Expand all
3691 'package_name': 'org/chromium/chrome/browser/ui/toolbar', 3707 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
3692 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'], 3708 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_l ist.h'],
3693 }, 3709 },
3694 'includes': [ '../build/android/java_cpp_template.gypi' ], 3710 'includes': [ '../build/android/java_cpp_template.gypi' ],
3695 }, 3711 },
3696 ], 3712 ],
3697 }, 3713 },
3698 ], 3714 ],
3699 ], 3715 ],
3700 } 3716 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698