summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authoramalika <amalika@google.com>2015-08-24 12:00:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-24 19:01:24 +0000
commit78d8cc1f0b5f4cb27d7d3b1c377e87c3d76f8160 (patch)
treeed6eb3680f9dc6c29bee8bcd178f5a8912098a8c /extensions/shell
parentb5387f8df31c544ea12193ac47d18407d8c6d9b6 (diff)
downloadchromium_src-78d8cc1f0b5f4cb27d7d3b1c377e87c3d76f8160.zip
chromium_src-78d8cc1f0b5f4cb27d7d3b1c377e87c3d76f8160.tar.gz
chromium_src-78d8cc1f0b5f4cb27d7d3b1c377e87c3d76f8160.tar.bz2
Fixing dependencies of the reverted commit of the chrome.i18n.detectLanguage API. Implementation on the renderer side
Please, see Original CL: https://codereview.chromium.org/1208993011/ Reverted: https://codereview.chromium.org/1244343002/ Temp CL we used to figure out deps: https://codereview.chromium.org/1268813004/ Initial patch for detectLanguage API implementation BUG=517628 Review URL: https://codereview.chromium.org/1273903002 Cr-Commit-Position: refs/heads/master@{#345134}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/BUILD.gn4
-rw-r--r--extensions/shell/app_shell.gyp4
2 files changed, 8 insertions, 0 deletions
diff --git a/extensions/shell/BUILD.gn b/extensions/shell/BUILD.gn
index 0c99278..c8e1958 100644
--- a/extensions/shell/BUILD.gn
+++ b/extensions/shell/BUILD.gn
@@ -130,6 +130,10 @@ source_set("app_shell_lib") {
deps += [ "//components/nacl:nacl_helper" ]
}
}
+
+ if (cld_version == 2) {
+ deps += [ "//third_party/cld_2:cld2_platform_impl" ]
+ }
}
if (!(is_chromeos && !use_ozone)) {
diff --git a/extensions/shell/app_shell.gyp b/extensions/shell/app_shell.gyp
index 4a41b30..9c6ead5 100644
--- a/extensions/shell/app_shell.gyp
+++ b/extensions/shell/app_shell.gyp
@@ -65,6 +65,10 @@
'<@(app_shell_lib_sources)',
],
'conditions': [
+ [ 'cld_version==2', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
+ }],
['use_aura==1', {
'dependencies': [
'<(DEPTH)/ui/wm/wm.gyp:wm',