diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 23:49:02 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-28 23:49:02 +0000 |
| commit | 9f4a56be5923dfb62216b81c10d2c05a2f52f9e2 (patch) | |
| tree | 6283308f39269c7dc2774cf8e05f0eb28fee6e2f | |
| parent | 39e93fa9177bda3a38dd29b21767ece709f14db2 (diff) | |
| download | chromium_src-9f4a56be5923dfb62216b81c10d2c05a2f52f9e2.zip chromium_src-9f4a56be5923dfb62216b81c10d2c05a2f52f9e2.tar.gz chromium_src-9f4a56be5923dfb62216b81c10d2c05a2f52f9e2.tar.bz2 | |
Merge 201446 "[Android] Add app version code to chrome://version."
> [Android] Add app version code to chrome://version.
>
> Version code information is useful for identifying different
> arch versions of Chrome on Android.
>
> BUG=233234
>
> Review URL: https://chromiumcodereview.appspot.com/14864023
TBR=shashishekhar@chromium.org
Review URL: https://codereview.chromium.org/16160007
git-svn-id: svn://svn.chromium.org/chrome/branches/1500/src@202692 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | base/android/java/src/org/chromium/base/BuildInfo.java | 5 | ||||
| -rw-r--r-- | chrome/browser/resources/about_version.html | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/version_ui.cc | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/base/android/java/src/org/chromium/base/BuildInfo.java b/base/android/java/src/org/chromium/base/BuildInfo.java index 2314051..81a8f34 100644 --- a/base/android/java/src/org/chromium/base/BuildInfo.java +++ b/base/android/java/src/org/chromium/base/BuildInfo.java @@ -67,7 +67,10 @@ public class BuildInfo { try { PackageManager pm = context.getPackageManager(); PackageInfo pi = pm.getPackageInfo(context.getPackageName(), 0); - msg = "" + pi.versionCode; + msg = ""; + if (pi.versionCode > 0) { + msg = Integer.toString(pi.versionCode); + } } catch (NameNotFoundException e) { Log.d(TAG, msg); } diff --git a/chrome/browser/resources/about_version.html b/chrome/browser/resources/about_version.html index 2cc78a2..540a0d8 100644 --- a/chrome/browser/resources/about_version.html +++ b/chrome/browser/resources/about_version.html @@ -39,7 +39,8 @@ about:version template page <td class="version" id="version"> <if expr="pp_ifdef('android')"> <span i18n-content="application_name"></span> - <span i18n-content="application_version"></span> + <span i18n-content="application_version_name"></span> + <span i18n-content="application_version_code"></span> </if> <if expr="not pp_ifdef('android')"> <span i18n-content="version"></span> diff --git a/chrome/browser/ui/webui/version_ui.cc b/chrome/browser/ui/webui/version_ui.cc index 6497ae0..c456208 100644 --- a/chrome/browser/ui/webui/version_ui.cc +++ b/chrome/browser/ui/webui/version_ui.cc @@ -62,8 +62,10 @@ content::WebUIDataSource* CreateVersionUIDataSource(Profile* profile) { base::android::BuildInfo::GetInstance(); html_source->AddString("application_name", android_build_info->package_label()); - html_source->AddString("application_version", + html_source->AddString("application_version_name", android_build_info->package_version_name()); + html_source->AddString("application_version_code", + android_build_info->package_version_code()); html_source->AddLocalizedString("build_id_name", IDS_ABOUT_VERSION_BUILD_ID); html_source->AddString("build_id", CHROME_BUILD_ID); |