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

Side by Side Diff: ios/chrome/ios_chrome.gyp

Issue 1149623002: [iOS] Upstream UpdateSearchEnginesIfNeeded (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « ios/chrome/browser/search_engines/search_engines_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 '../../components/components.gyp:autofill_core_browser', 47 '../../components/components.gyp:autofill_core_browser',
48 '../../components/components.gyp:autofill_ios_browser', 48 '../../components/components.gyp:autofill_ios_browser',
49 '../../components/components.gyp:data_reduction_proxy_core_common', 49 '../../components/components.gyp:data_reduction_proxy_core_common',
50 '../../components/components.gyp:dom_distiller_core', 50 '../../components/components.gyp:dom_distiller_core',
51 '../../components/components.gyp:dom_distiller_ios', 51 '../../components/components.gyp:dom_distiller_ios',
52 '../../components/components.gyp:infobars_core', 52 '../../components/components.gyp:infobars_core',
53 '../../components/components.gyp:keyed_service_core', 53 '../../components/components.gyp:keyed_service_core',
54 '../../components/components.gyp:keyed_service_ios', 54 '../../components/components.gyp:keyed_service_ios',
55 '../../components/components.gyp:leveldb_proto', 55 '../../components/components.gyp:leveldb_proto',
56 '../../components/components.gyp:pref_registry', 56 '../../components/components.gyp:pref_registry',
57 '../../components/components.gyp:search_engines',
57 '../../components/components.gyp:suggestions', 58 '../../components/components.gyp:suggestions',
59 '../../components/components.gyp:sync_driver',
58 '../../components/components.gyp:translate_core_browser', 60 '../../components/components.gyp:translate_core_browser',
59 '../../components/components.gyp:translate_ios_browser', 61 '../../components/components.gyp:translate_ios_browser',
60 '../../components/components.gyp:sync_driver',
61 '../../components/components.gyp:web_resource', 62 '../../components/components.gyp:web_resource',
62 '../../components/components.gyp:webp_transcode', 63 '../../components/components.gyp:webp_transcode',
63 '../../components/components_strings.gyp:components_strings', 64 '../../components/components_strings.gyp:components_strings',
64 '../../net/net.gyp:net', 65 '../../net/net.gyp:net',
65 '../../skia/skia.gyp:skia', 66 '../../skia/skia.gyp:skia',
66 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:goo gle_toolbox_for_mac', 67 '../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:goo gle_toolbox_for_mac',
67 '../../ui/base/ui_base.gyp:ui_base', 68 '../../ui/base/ui_base.gyp:ui_base',
68 '../../ui/gfx/gfx.gyp:gfx', 69 '../../ui/gfx/gfx.gyp:gfx',
69 '../../url/url.gyp:url_lib', 70 '../../url/url.gyp:url_lib',
70 '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser', 71 '../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser',
(...skipping 14 matching lines...) Expand all
85 }, 86 },
86 'sources': [ 87 'sources': [
87 'browser/app_startup_parameters.h', 88 'browser/app_startup_parameters.h',
88 'browser/app_startup_parameters.mm', 89 'browser/app_startup_parameters.mm',
89 'browser/application_context.cc', 90 'browser/application_context.cc',
90 'browser/application_context.h', 91 'browser/application_context.h',
91 'browser/application_context_impl.cc', 92 'browser/application_context_impl.cc',
92 'browser/application_context_impl.h', 93 'browser/application_context_impl.h',
93 'browser/arch_util.cc', 94 'browser/arch_util.cc',
94 'browser/arch_util.h', 95 'browser/arch_util.h',
96 'browser/search_engines/search_engines_util.cc',
97 'browser/search_engines/search_engines_util.h',
95 'browser/authentication/constants.h', 98 'browser/authentication/constants.h',
96 'browser/authentication/constants.mm', 99 'browser/authentication/constants.mm',
97 'browser/autofill/autofill_agent_utils.h', 100 'browser/autofill/autofill_agent_utils.h',
98 'browser/autofill/autofill_agent_utils.mm', 101 'browser/autofill/autofill_agent_utils.mm',
99 'browser/autofill/form_input_accessory_view.h', 102 'browser/autofill/form_input_accessory_view.h',
100 'browser/autofill/form_input_accessory_view.mm', 103 'browser/autofill/form_input_accessory_view.mm',
101 'browser/autofill/form_input_accessory_view_controller.h', 104 'browser/autofill/form_input_accessory_view_controller.h',
102 'browser/autofill/form_input_accessory_view_controller.mm', 105 'browser/autofill/form_input_accessory_view_controller.mm',
103 'browser/autofill/form_input_accessory_view_delegate.h', 106 'browser/autofill/form_input_accessory_view_delegate.h',
104 'browser/autofill/form_suggestion_controller.h', 107 'browser/autofill/form_suggestion_controller.h',
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 '../../ios/web/js_compile.gypi', 312 '../../ios/web/js_compile.gypi',
310 ], 313 ],
311 'link_settings': { 314 'link_settings': {
312 'mac_bundle_resources': [ 315 'mac_bundle_resources': [
313 '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js', 316 '<(SHARED_INTERMEDIATE_DIR)/find_in_page.js',
314 ], 317 ],
315 }, 318 },
316 }, 319 },
317 ], 320 ],
318 } 321 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/search_engines/search_engines_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698