ios/chrome/ios_chrome.gyp - Issue 809333003: Upstream //ios/chrome/browser/translate

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ios/chrome/ios_chrome.gyp

Issue 809333003: Upstream //ios/chrome/browser/translate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: update grit whitelist Created 5 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 side-by-side diff with in-line comments

Download patch

« ios/chrome/browser/translate/translate_service_ios.cc ('K') | « ios/chrome/browser/translate/translate_service_ios_unittest.cc ('k') | ios/chrome/ios_chrome_resources.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/ios_chrome.gyp

diff --git a/ios/chrome/ios_chrome.gyp b/ios/chrome/ios_chrome.gyp

index fbdfc03659fbdd0f0bb91a1adc235c6979ba13e5..b98d0482553e8fe7d332c62d3d4258cc3eef74a0 100644

--- a/ios/chrome/ios_chrome.gyp

+++ b/ios/chrome/ios_chrome.gyp

@@ -21,12 +21,15 @@

'../../components/components.gyp:leveldb_proto',

'../../components/components.gyp:suggestions',

'../../components/components.gyp:translate_core_browser',

+ '../../components/components.gyp:translate_ios_browser',

'../../components/components.gyp:webp_transcode',

+ '../../components/components_strings.gyp:components_strings',

'../../net/net.gyp:net',

'../../skia/skia.gyp:skia',

'../../url/url.gyp:url_lib',

'../provider/ios_provider_chrome.gyp:ios_provider_chrome_browser',

'../web/ios_web.gyp:ios_web',

+ 'ios_chrome_resources.gyp:ios_theme_resources_gen',

'sources': [

'browser/application_context.cc',

@@ -47,10 +50,27 @@

'browser/infobars/infobar_controller.mm',

'browser/net/image_fetcher.h',

'browser/net/image_fetcher.mm',

+ 'browser/pref_names.cc',

+ 'browser/pref_names.h',

'browser/suggestions/image_fetcher_impl.h',

'browser/suggestions/image_fetcher_impl.mm',

'browser/suggestions/suggestions_service_factory.h',

'browser/suggestions/suggestions_service_factory.mm',

+ 'browser/translate/after_translate_infobar_controller.h',

+ 'browser/translate/after_translate_infobar_controller.mm',

+ 'browser/translate/before_translate_infobar_controller.h',

+ 'browser/translate/before_translate_infobar_controller.mm',

+ 'browser/translate/chrome_ios_translate_client.h',

+ 'browser/translate/chrome_ios_translate_client.mm',

+ 'browser/translate/never_translate_infobar_controller.h',

+ 'browser/translate/never_translate_infobar_controller.mm',

+ 'browser/translate/translate_accept_languages_factory.cc',

+ 'browser/translate/translate_accept_languages_factory.h',

+ 'browser/translate/translate_infobar_tags.h',

+ 'browser/translate/translate_message_infobar_controller.h',

+ 'browser/translate/translate_message_infobar_controller.mm',

+ 'browser/translate/translate_service_ios.cc',

+ 'browser/translate/translate_service_ios.h',