[Android] De-localize "Developer Build" string in version_info
This is a developer-only string and in other places it's not localized. Removing this dependency simplifies the code and allows it to be moved to //base without setting up localization in //base. Bug: 1442347 Change-Id: Ib755acea4f9830c95be565c4297cff63af846330 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5142266 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Ted Choc <tedchoc@chromium.org> Cr-Commit-Position: refs/heads/main@{#1242105}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
7da3efaedb
commit
94a3b22f21
components/version_info
@@ -36,14 +36,10 @@ static_library("version_string") {
|
|||||||
"version_string.h",
|
"version_string.h",
|
||||||
]
|
]
|
||||||
|
|
||||||
deps = [
|
deps = [ ":version_info" ]
|
||||||
":version_info",
|
|
||||||
"//components/strings",
|
|
||||||
]
|
|
||||||
|
|
||||||
if (use_unofficial_version_number) {
|
if (use_unofficial_version_number) {
|
||||||
defines = [ "USE_UNOFFICIAL_VERSION_NUMBER" ]
|
defines = [ "USE_UNOFFICIAL_VERSION_NUMBER" ]
|
||||||
deps += [ "//ui/base" ]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -4,22 +4,15 @@
|
|||||||
|
|
||||||
#include "components/version_info/version_string.h"
|
#include "components/version_info/version_string.h"
|
||||||
|
|
||||||
#include "components/strings/grit/components_strings.h"
|
|
||||||
#include "components/version_info/version_info.h"
|
#include "components/version_info/version_info.h"
|
||||||
|
|
||||||
#if defined(USE_UNOFFICIAL_VERSION_NUMBER)
|
|
||||||
#include "ui/base/l10n/l10n_util.h" // nogncheck
|
|
||||||
#endif // USE_UNOFFICIAL_VERSION_NUMBER
|
|
||||||
|
|
||||||
namespace version_info {
|
namespace version_info {
|
||||||
|
|
||||||
std::string GetVersionStringWithModifier(const std::string& modifier) {
|
std::string GetVersionStringWithModifier(const std::string& modifier) {
|
||||||
std::string current_version;
|
std::string current_version;
|
||||||
current_version += GetVersionNumber();
|
current_version += GetVersionNumber();
|
||||||
#if defined(USE_UNOFFICIAL_VERSION_NUMBER)
|
#if defined(USE_UNOFFICIAL_VERSION_NUMBER)
|
||||||
current_version += " (";
|
current_version += " (Developer Build ";
|
||||||
current_version += l10n_util::GetStringUTF8(IDS_VERSION_UI_UNOFFICIAL);
|
|
||||||
current_version += " ";
|
|
||||||
current_version += GetLastChange();
|
current_version += GetLastChange();
|
||||||
current_version += " ";
|
current_version += " ";
|
||||||
current_version += GetOSType();
|
current_version += GetOSType();
|
||||||
|
Reference in New Issue
Block a user