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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 11186010: Update geolocation infobar to handle Android system settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix conflict Created 8 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 | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'targets': [ 7 'targets': [
8 { 8 {
9 'target_name': 'browser', 9 'target_name': 'browser',
10 'type': 'static_library', 10 'type': 'static_library',
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 'browser/android/chrome_jni_registrar.cc', 116 'browser/android/chrome_jni_registrar.cc',
117 'browser/android/chrome_jni_registrar.h', 117 'browser/android/chrome_jni_registrar.h',
118 'browser/android/chrome_startup_flags.cc', 118 'browser/android/chrome_startup_flags.cc',
119 'browser/android/chrome_startup_flags.h', 119 'browser/android/chrome_startup_flags.h',
120 'browser/android/chrome_web_contents_delegate_android.cc', 120 'browser/android/chrome_web_contents_delegate_android.cc',
121 'browser/android/chrome_web_contents_delegate_android.h', 121 'browser/android/chrome_web_contents_delegate_android.h',
122 'browser/android/content_view_util.cc', 122 'browser/android/content_view_util.cc',
123 'browser/android/content_view_util.h', 123 'browser/android/content_view_util.h',
124 'browser/android/devtools_server.cc', 124 'browser/android/devtools_server.cc',
125 'browser/android/devtools_server.h', 125 'browser/android/devtools_server.h',
126 'browser/android/google_location_settings_helper.cc',
127 'browser/android/google_location_settings_helper.h',
128 'browser/android/google_location_settings_helper_factory.cc',
129 'browser/android/google_location_settings_helper_factory.h',
126 'browser/android/intent_helper.cc', 130 'browser/android/intent_helper.cc',
127 'browser/android/intent_helper.h', 131 'browser/android/intent_helper.h',
128 'browser/android/process_utils.cc', 132 'browser/android/process_utils.cc',
129 'browser/android/process_utils.h', 133 'browser/android/process_utils.h',
130 'browser/android/provider/blocking_ui_thread_async_request.cc', 134 'browser/android/provider/blocking_ui_thread_async_request.cc',
131 'browser/android/provider/blocking_ui_thread_async_request.h', 135 'browser/android/provider/blocking_ui_thread_async_request.h',
132 'browser/android/provider/bookmark_model_observer_task.cc', 136 'browser/android/provider/bookmark_model_observer_task.cc',
133 'browser/android/provider/bookmark_model_observer_task.h', 137 'browser/android/provider/bookmark_model_observer_task.h',
134 'browser/android/provider/chrome_browser_provider.cc', 138 'browser/android/provider/chrome_browser_provider.cc',
135 'browser/android/provider/chrome_browser_provider.h', 139 'browser/android/provider/chrome_browser_provider.h',
(...skipping 2712 matching lines...) Expand 10 before | Expand all | Expand 10 after
2848 ['OS=="android"', { 2852 ['OS=="android"', {
2849 'targets': [ 2853 'targets': [
2850 { 2854 {
2851 'target_name': 'chrome_browser_jni_headers', 2855 'target_name': 'chrome_browser_jni_headers',
2852 'type': 'none', 2856 'type': 'none',
2853 'sources': [ 2857 'sources': [
2854 'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider. java', 2858 'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider. java',
2855 'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler. java', 2859 'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler. java',
2856 'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDeleg ateAndroid.java', 2860 'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDeleg ateAndroid.java',
2857 'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java', 2861 'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
2862 'android/java/src/org/chromium/chrome/browser/GoogleLocationSettings Helper.java',
2863 'android/java/src/org/chromium/chrome/browser/GoogleLocationSettings HelperImpl.java',
2858 'android/java/src/org/chromium/chrome/browser/IntentHelper.java', 2864 'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
2859 'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDial og.java', 2865 'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDial og.java',
2860 'android/java/src/org/chromium/chrome/browser/ProcessUtils.java', 2866 'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
2861 'android/java/src/org/chromium/chrome/browser/TabBase.java', 2867 'android/java/src/org/chromium/chrome/browser/TabBase.java',
2862 'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor. java', 2868 'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor. java',
2863 ], 2869 ],
2864 'variables': { 2870 'variables': {
2865 'jni_gen_dir': 'chrome', 2871 'jni_gen_dir': 'chrome',
2866 }, 2872 },
2867 'includes': [ '../build/jni_generator.gypi' ], 2873 'includes': [ '../build/jni_generator.gypi' ],
(...skipping 29 matching lines...) Expand all
2897 'proto_in_dir': '../third_party/cros_system_api/dbus', 2903 'proto_in_dir': '../third_party/cros_system_api/dbus',
2898 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 2904 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
2899 }, 2905 },
2900 'includes': ['../build/protoc.gypi'], 2906 'includes': ['../build/protoc.gypi'],
2901 }, 2907 },
2902 ], 2908 ],
2903 }, 2909 },
2904 ], 2910 ],
2905 ], 2911 ],
2906 } 2912 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698