Commit 7dc057bd authored by Renjie Liu's avatar Renjie Liu Committed by Commit Bot

move language code locator to content.

Move the language code locator util from components/language =>
components/language/content/browser as it will only used by the
GeoLanguageProvider.

Bug: 76915
Change-Id: I45695bf2c1149f89e7f6d13a41a5f80ea0084ba8
Reviewed-on: https://chromium-review.googlesource.com/818596
Commit-Queue: Renjie Liu <renjieliu@chromium.org>
Reviewed-by: default avatarColin Blundell <blundell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523272}
parent fb932d15
...@@ -198,7 +198,7 @@ test("components_unittests") { ...@@ -198,7 +198,7 @@ test("components_unittests") {
"//components/history/content/browser:unit_tests", "//components/history/content/browser:unit_tests",
"//components/invalidation/impl:unit_tests", "//components/invalidation/impl:unit_tests",
"//components/keyed_service/content:unit_tests", "//components/keyed_service/content:unit_tests",
"//components/language:unit_tests", "//components/language/content/browser:unit_tests",
"//components/link_header_util:unit_tests", "//components/link_header_util:unit_tests",
"//components/navigation_interception:unit_tests", "//components/navigation_interception:unit_tests",
"//components/network_hints/renderer:unit_tests", "//components/network_hints/renderer:unit_tests",
...@@ -469,7 +469,9 @@ if (!is_ios) { ...@@ -469,7 +469,9 @@ if (!is_ios) {
} }
if (is_android) { if (is_android) {
sources += [ "test/android/browsertests_apk/components_browser_tests_jni_onload.cc" ] sources += [
"test/android/browsertests_apk/components_browser_tests_jni_onload.cc",
]
sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ] sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ]
deps += [ deps += [
"//content/public/test/android:layouttest_java_support", "//content/public/test/android:layouttest_java_support",
...@@ -526,7 +528,9 @@ if (!is_ios) { ...@@ -526,7 +528,9 @@ if (!is_ios) {
] ]
if (!is_ios) { if (!is_ios) {
sources += [ "discardable_memory/common/discardable_shared_memory_heap_perftest.cc" ] sources += [
"discardable_memory/common/discardable_shared_memory_heap_perftest.cc",
]
deps += [ "//components/discardable_memory/common" ] deps += [ "//components/discardable_memory/common" ]
} }
} }
......
...@@ -13,7 +13,3 @@ content/: Driver for the shared code based on the content layer. ...@@ -13,7 +13,3 @@ content/: Driver for the shared code based on the content layer.
renderer/: Renderer process code. renderer/: Renderer process code.
common/: Code shared by the browser and the renderer. common/: Code shared by the browser and the renderer.
ios/: Driver for the shared code based on src/ios. ios/: Driver for the shared code based on src/ios.
Note:
The language code locator is built on all platforms but iOS since iOS currently
does not support //device/geolocation. See http://crbug.com/774879 for details.
Note:
The language code locator is built on all platforms but iOS since iOS currently
does not support //device/geolocation. See http://crbug.com/774879 for details.
...@@ -14,6 +14,8 @@ sys.path.insert(1, ...@@ -14,6 +14,8 @@ sys.path.insert(1,
os.path.join(os.path.dirname(__file__), os.path.join(os.path.dirname(__file__),
os.path.pardir, os.path.pardir,
os.path.pardir, os.path.pardir,
os.path.pardir,
os.path.pardir,
"third_party")) "third_party"))
import jinja2 # pylint: disable=F0401 import jinja2 # pylint: disable=F0401
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "components/language/language_code_locator.h" #include "components/language/content/browser/language_code_locator.h"
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "third_party/s2cellid/src/s2/s2cellid.h" #include "third_party/s2cellid/src/s2/s2cellid.h"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef COMPONENTS_LANGUAGE_LANGUAGE_CODE_LOCATOR_H_ #ifndef COMPONENTS_LANGUAGE_CONTENT_BROWSER_LANGUAGE_CODE_LOCATOR_H_
#define COMPONENTS_LANGUAGE_LANGUAGE_CODE_LOCATOR_H_ #define COMPONENTS_LANGUAGE_CONTENT_BROWSER_LANGUAGE_CODE_LOCATOR_H_
#include <string> #include <string>
#include <vector> #include <vector>
...@@ -32,4 +32,4 @@ class LanguageCodeLocator { ...@@ -32,4 +32,4 @@ class LanguageCodeLocator {
} // namespace language } // namespace language
#endif // COMPONENTS_LANGUAGE_LANGUAGE_CODE_LOCATOR_H_ #endif // COMPONENTS_LANGUAGE_CONTENT_BROWSER_LANGUAGE_CODE_LOCATOR_H_
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "components/language/language_code_locator.h" #include "components/language/content/browser/language_code_locator.h"
#include <string> #include <string>
#include <vector> #include <vector>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment