summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-05 23:26:21 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-05 23:26:21 +0000
commit743ad0140836bf77168c53a20b06b12b8a807a0f (patch)
tree83d41d10d705a77f950f85a263e720b231865011 /remoting/base
parentab9356c289a1c71d202125138e601c1e53457d25 (diff)
downloadchromium_src-743ad0140836bf77168c53a20b06b12b8a807a0f.zip
chromium_src-743ad0140836bf77168c53a20b06b12b8a807a0f.tar.gz
chromium_src-743ad0140836bf77168c53a20b06b12b8a807a0f.tar.bz2
Move Chromoting strings to string_resources.grd and simplify remoting_resources target.
Previously all strings were in messages.json files. Moving them to GRD file will allow to share them with native components. Also 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://codereview.chromium.org/11275101 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166068 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 aa94ec3..0542007 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_REMOTING_PRODUCT_NAME));
+ l10n_util::GetStringUTF8(IDR_PRODUCT_NAME));
}
TEST_F(ResourcesTest, MAYBE_ProductLogo) {