summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 03:34:35 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 03:34:35 +0000
commit63e96497767c184c4026be3850bb1ff59223f87b (patch)
treedaae0f1ae219829ae4edd08ed3d60b5be10cf2ff /remoting/base
parent5abfa4f0bd434526663b4ff776698069a1f3a8da (diff)
downloadchromium_src-63e96497767c184c4026be3850bb1ff59223f87b.zip
chromium_src-63e96497767c184c4026be3850bb1ff59223f87b.tar.gz
chromium_src-63e96497767c184c4026be3850bb1ff59223f87b.tar.bz2
Revert 165605 - Fix branding in chromoting string resources.
When chromoting resources were converted from messages.json to .grd format incorrect branding was used. Beside that simplified how resources are generated: 1. Now <if> is used to handle branded strings instead of generating grd file in build time 2. Removed resource_ids - ids are now specified in grd files. BUG=158995 Review URL: https://chromiumcodereview.appspot.com/11275101 TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/11359035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
-rw-r--r--remoting/base/resources_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc
index 0542007..aa94ec3 100644
--- a/remoting/base/resources_unittest.cc
+++ b/remoting/base/resources_unittest.cc
@@ -40,7 +40,7 @@ TEST_F(ResourcesTest, MAYBE_ProductName) {
std::string expected_product_name = "Chromoting";
#endif // !defined(GOOGLE_CHROME_BUILD)
EXPECT_EQ(expected_product_name,
- l10n_util::GetStringUTF8(IDR_PRODUCT_NAME));
+ l10n_util::GetStringUTF8(IDR_REMOTING_PRODUCT_NAME));
}
TEST_F(ResourcesTest, MAYBE_ProductLogo) {