Refactor language detection logic to allow non-static CLD data sources.

components/translate.gypi

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //components/translate/core/browser
       'target_name': 'translate_core_browser',
       'type': 'static_library',
@@ skipping 120 matching lines @@
           'dependencies': [
             'translate_core_browser',
             '../base/base.gyp:base',
             '../content/content.gyp:content_browser',
           ],
           'include_dirs': [
             '..',
           ],
           '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',
           ],
         },
         {
           # GN version: //components/translate/content/common
           'target_name': 'translate_content_common',
           'type': 'static_library',
           'dependencies': [
             'translate_core_common',
             'translate_core_language_detection',
             '../base/base.gyp:base',
             '../content/content.gyp:content_common',
             '../ipc/ipc.gyp:ipc',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             # 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',
            ],
         },
         {
           # GN version: //components/translate/content/renderer
           'target_name': 'translate_content_renderer',
           'type': 'static_library',
           'dependencies': [
             'translate_content_common',
             'translate_core_common',
             'translate_core_language_detection',
             '../base/base.gyp:base',
             '../content/content.gyp:content_common',
             '../content/content.gyp:content_renderer',
             '../ipc/ipc.gyp:ipc',
             '../third_party/WebKit/public/blink.gyp:blink',
             '../url/url.gyp:url_lib',
             '../v8/tools/gyp/v8.gyp:v8',
           ],
           'include_dirs': [
             '..',
           ],
           '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', {
               'dependencies': [
                 '<(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',
-              ]},
-            ],
           ],
         },
       ],
     }],
   ],
 }