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

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: Missed removing some diffs Created 8 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 | 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 2725 matching lines...) Expand 10 before | Expand all | Expand 10 after
2861 ['OS=="android"', { 2865 ['OS=="android"', {
2862 'targets': [ 2866 'targets': [
2863 { 2867 {
2864 'target_name': 'chrome_browser_jni_headers', 2868 'target_name': 'chrome_browser_jni_headers',
2865 'type': 'none', 2869 'type': 'none',
2866 'sources': [ 2870 'sources': [
2867 'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider. java', 2871 'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider. java',
2868 'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler. java', 2872 'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler. java',
2869 'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDeleg ateAndroid.java', 2873 'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDeleg ateAndroid.java',
2870 'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java', 2874 'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
2875 'android/java/src/org/chromium/chrome/browser/GoogleLocationSettings Helper.java',
2876 'android/java/src/org/chromium/chrome/browser/GoogleLocationSettings HelperImpl.java',
2871 'android/java/src/org/chromium/chrome/browser/IntentHelper.java', 2877 'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
2872 'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDial og.java', 2878 'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDial og.java',
2873 'android/java/src/org/chromium/chrome/browser/ProcessUtils.java', 2879 'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
2874 'android/java/src/org/chromium/chrome/browser/TabBase.java', 2880 'android/java/src/org/chromium/chrome/browser/TabBase.java',
2875 'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor. java', 2881 'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor. java',
2876 ], 2882 ],
2877 'variables': { 2883 'variables': {
2878 'jni_gen_dir': 'chrome', 2884 'jni_gen_dir': 'chrome',
2879 }, 2885 },
2880 'includes': [ '../build/jni_generator.gypi' ], 2886 'includes': [ '../build/jni_generator.gypi' ],
(...skipping 29 matching lines...) Expand all
2910 'proto_in_dir': '../third_party/cros_system_api/dbus', 2916 'proto_in_dir': '../third_party/cros_system_api/dbus',
2911 'proto_out_dir': 'chrome/browser/media_transfer_protocol', 2917 'proto_out_dir': 'chrome/browser/media_transfer_protocol',
2912 }, 2918 },
2913 'includes': ['../build/protoc.gypi'], 2919 'includes': ['../build/protoc.gypi'],
2914 }, 2920 },
2915 ], 2921 ],
2916 }, 2922 },
2917 ], 2923 ],
2918 ], 2924 ],
2919 } 2925 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698