From 9f03ba31407bbb0ccb395a0a1fc452685001f70b Mon Sep 17 00:00:00 2001
From: newt <newt@chromium.org>
Date: Fri, 12 Dec 2014 15:09:51 -0800
Subject: [PATCH] Fix bug where app name is wrong in all languages except
 English.

The "app_name" string needs to be defined in an Android resources XML file
instead of in android_chrome_strings.grd so the string isn't copied into
every language (which makes it impossible to override the string from a
single strings.xml file)

BUG=441424

Review URL: https://codereview.chromium.org/800953002

Cr-Commit-Position: refs/heads/master@{#308189}
---
 chrome/android/java/res/values/app_name.xml            | 17 +++++++++++++++++
 chrome/android/java/strings/android_chrome_strings.grd |  4 ----
 chrome/android/shell/java/AndroidManifest.xml.jinja2   |  2 +-
 chrome/android/shell/res/values/strings.xml            |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 chrome/android/java/res/values/app_name.xml

diff --git a/chrome/android/java/res/values/app_name.xml b/chrome/android/java/res/values/app_name.xml
new file mode 100644
index 000000000000..e509cad7a857
--- /dev/null
+++ b/chrome/android/java/res/values/app_name.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2014 The Chromium Authors. All rights reserved.
+     Use of this source code is governed by a BSD-style license that can be
+     found in the LICENSE file. -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The application name.
+
+         The value of this string may be overridden in an APK by including a
+         string with the same name but a different value (e.g. "Chrome Shell").
+
+         Note: this must live in app_name.xml rather than
+         android_chrome_strings.grd so the string isn't copied into every
+         language (which makes it impossible to override the string from a
+         single strings.xml file). -->
+    <string name="app_name">Chromium</string>
+</resources>
diff --git a/chrome/android/java/strings/android_chrome_strings.grd b/chrome/android/java/strings/android_chrome_strings.grd
index 178bafc4728d..d26a18f9bf18 100644
--- a/chrome/android/java/strings/android_chrome_strings.grd
+++ b/chrome/android/java/strings/android_chrome_strings.grd
@@ -93,10 +93,6 @@
   </translations>
   <release allow_pseudo="false" seq="1">
     <messages fallback_to_english="true">
-      <message name="IDS_APP_NAME" desc="The application name" translateable="false">
-        Chromium
-      </message>
-
       <!-- Generic strings -->
       <message name="IDS_OK" desc="Label for a confirm button. Used in multiple contexts. [CHAR-LIMIT=20]">
         OK
diff --git a/chrome/android/shell/java/AndroidManifest.xml.jinja2 b/chrome/android/shell/java/AndroidManifest.xml.jinja2
index 95aa0f772fb4..43b317829545 100644
--- a/chrome/android/shell/java/AndroidManifest.xml.jinja2
+++ b/chrome/android/shell/java/AndroidManifest.xml.jinja2
@@ -38,7 +38,7 @@
 
     <application android:name="org.chromium.chrome.shell.ChromeShellApplication"
             android:icon="@mipmap/app_icon"
-            android:label="Chrome Shell">
+            android:label="@string/app_name">
         <activity android:name="org.chromium.chrome.shell.ChromeShellActivity"
                   android:launchMode="singleTask"
                   android:theme="@style/MainTheme"
diff --git a/chrome/android/shell/res/values/strings.xml b/chrome/android/shell/res/values/strings.xml
index 2bd7b5cd9515..87fa37d60a55 100644
--- a/chrome/android/shell/res/values/strings.xml
+++ b/chrome/android/shell/res/values/strings.xml
@@ -7,6 +7,7 @@
  -->
 
 <resources>
+    <string name="app_name">Chrome Shell</string>
     <string name="url_hint">Type URL Here</string>
     <string name="print_menu">Print…</string>
     <string name="signin_select_account">Select Account</string>
-- 
2.11.4.GIT