diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 20:17:54 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-05 20:17:54 +0000 |
| commit | 1b970e1d5f613e36f6751164d236c05fddc85398 (patch) | |
| tree | 58e5200c76ad0b1983a0b227af532d318de602c1 /remoting/base | |
| parent | 8340556be735e45872f4928d8c7c3a9ccda37227 (diff) | |
| download | chromium_src-1b970e1d5f613e36f6751164d236c05fddc85398.zip chromium_src-1b970e1d5f613e36f6751164d236c05fddc85398.tar.gz chromium_src-1b970e1d5f613e36f6751164d236c05fddc85398.tar.bz2 | |
Revert 166003 - 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
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/11365095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/resources_unittest.cc | 2 |
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) { |