| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/android/browser_version.h" | 5 #include "chrome/browser/android/browser_version.h" |
| 6 | 6 |
| 7 #include "base/android/jni_string.h" | |
| 8 #include "chrome/common/chrome_version_info.h" | 7 #include "chrome/common/chrome_version_info.h" |
| 9 #include "chrome/grit/locale_settings.h" | |
| 10 #include "jni/BrowserVersion_jni.h" | 8 #include "jni/BrowserVersion_jni.h" |
| 11 #include "ui/base/l10n/l10n_util.h" | |
| 12 | |
| 13 using base::android::ConvertUTF8ToJavaString; | |
| 14 | 9 |
| 15 static jboolean IsOfficialBuild(JNIEnv* env, jclass /* clazz */) { | 10 static jboolean IsOfficialBuild(JNIEnv* env, jclass /* clazz */) { |
| 16 return chrome::VersionInfo().IsOfficialBuild(); | 11 return chrome::VersionInfo().IsOfficialBuild(); |
| 17 } | 12 } |
| 18 | 13 |
| 19 static jstring GetTermsOfServiceHtml(JNIEnv* env, jclass /* clazz */) { | |
| 20 return ConvertUTF8ToJavaString(env, | |
| 21 l10n_util::GetStringUTF8(IDS_TERMS_HTML)).Release(); | |
| 22 } | |
| 23 | |
| 24 bool RegisterBrowserVersion(JNIEnv* env) { | 14 bool RegisterBrowserVersion(JNIEnv* env) { |
| 25 return RegisterNativesImpl(env); | 15 return RegisterNativesImpl(env); |
| 26 } | 16 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 619773002:
Remove ToS strings on Android. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master