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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/translate.gypi

Issue 461633002: Refactor language detection logic to allow non-static CLD data sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and merge Created 6 years, 3 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
« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/translate/chrome_translate_client.cc ('k') | components/translate/content/browser/browser_cld_data_provider.h » ('j') | components/translate/content/browser/browser_cld_data_provider.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/translate.gypi
diff --git a/components/translate.gypi b/components/translate.gypi
index 2be7c32b260b5c2572df056059aff93081886d65..02aef6583ea5e95b5ba9e224f262899592168a86 100644
--- a/components/translate.gypi
+++ b/components/translate.gypi
@@ -138,23 +138,18 @@
],
'sources': [
# Note: sources list duplicated in GN build.
+ 'translate/content/browser/browser_cld_data_provider.cc',
'translate/content/browser/browser_cld_data_provider.h',
+ 'translate/content/browser/browser_cld_data_provider_factory.cc',
+ 'translate/content/browser/browser_cld_data_provider_factory.h',
'translate/content/browser/content_translate_driver.cc',
'translate/content/browser/content_translate_driver.h',
- ],
- 'conditions': [
- ['cld2_data_source=="standalone" or cld2_data_source=="component"', {
- 'sources': [
- 'translate/content/browser/data_file_browser_cld_data_provider.cc',
- 'translate/content/browser/data_file_browser_cld_data_provider.h',
- ]},
- ],
- ['cld2_data_source=="static"', {
- 'sources': [
- 'translate/content/browser/static_browser_cld_data_provider.cc',
- 'translate/content/browser/static_browser_cld_data_provider.h',
- ]},
- ],
+ #'translate/content/browser/data_file_browser_cld_data_provider.cc',
Andrew Hayden (chromium.org) 2014/09/26 10:22:49 Just include these all the time?
Andrew Hayden (chromium.org) 2014/10/28 15:18:39 Done.
+ #'translate/content/browser/data_file_browser_cld_data_provider.h',
+ 'translate/content/browser/static_browser_cld_data_provider.cc',
+ 'translate/content/browser/static_browser_cld_data_provider.h',
+ 'translate/content/browser/static_browser_cld_data_provider_factory.cc',
+ 'translate/content/browser/static_browser_cld_data_provider_factory.h',
],
},
{
@@ -175,30 +170,10 @@
# Note: sources list duplicated in GN build.
'translate/content/common/translate_messages.cc',
'translate/content/common/translate_messages.h',
+ 'translate/content/common/cld_data_source.cc',
'translate/content/common/cld_data_source.h',
- ],
- 'conditions': [
- ['cld2_data_source=="standalone" or cld2_data_source=="component"', {
- 'sources': [
- 'translate/content/common/data_file_cld_data_provider_messages.cc',
- 'translate/content/common/data_file_cld_data_provider_messages.h',
- ]},
- ],
- ['cld2_data_source=="standalone"', {
- 'sources': [
- 'translate/content/common/standalone_cld_data_source.cc',
- ]},
- ],
- ['cld2_data_source=="component"', {
- 'sources': [
- 'translate/content/common/component_cld_data_source.cc',
- ]},
- ],
- ['cld2_data_source=="static"', {
- 'sources': [
- 'translate/content/common/static_cld_data_source.cc',
- ]},
- ],
+ #'translate/content/common/data_file_cld_data_provider_messages.cc',
Andrew Hayden (chromium.org) 2014/09/26 10:22:49 Just include these all the time?
Andrew Hayden (chromium.org) 2014/10/28 15:18:39 Done.
+ #'translate/content/common/data_file_cld_data_provider_messages.h',
],
},
{
@@ -222,9 +197,14 @@
],
'sources': [
# Note: sources list duplicated in GN build.
+ 'translate/content/renderer/renderer_cld_data_provider.cc',
'translate/content/renderer/renderer_cld_data_provider.h',
'translate/content/renderer/translate_helper.cc',
'translate/content/renderer/translate_helper.h',
+ #'translate/content/renderer/data_file_renderer_cld_data_provider.cc',
+ #'translate/content/renderer/data_file_renderer_cld_data_provider.h',
Andrew Hayden (chromium.org) 2014/09/26 10:22:49 Just include these all the time?
Andrew Hayden (chromium.org) 2014/10/28 15:18:39 Done.
+ 'translate/content/renderer/static_renderer_cld_data_provider.cc',
+ 'translate/content/renderer/static_renderer_cld_data_provider.h',
],
'conditions': [
['cld_version==0 or cld_version==2', {
@@ -232,18 +212,6 @@
'<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
],
}],
- ['cld2_data_source=="standalone" or cld2_data_source=="component"', {
- 'sources': [
- 'translate/content/renderer/data_file_renderer_cld_data_provider.cc',
- 'translate/content/renderer/data_file_renderer_cld_data_provider.h',
- ]},
- ],
- ['cld2_data_source=="static"', {
- 'sources': [
- 'translate/content/renderer/static_renderer_cld_data_provider.cc',
- 'translate/content/renderer/static_renderer_cld_data_provider.h',
- ]},
- ],
],
},
],
« chrome/browser/chrome_browser_main.cc ('K') | « chrome/browser/translate/chrome_translate_client.cc ('k') | components/translate/content/browser/browser_cld_data_provider.h » ('j') | components/translate/content/browser/browser_cld_data_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698