Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Issue 11275101: Fix branding in chromoting string resources (Closed)

Created:
8 years, 1 month ago by Sergey Ulanov
Modified:
8 years, 1 month ago
Reviewers:
tony, simonmorris, Jamie
CC:
chromium-reviews, jamiewalch+watch_chromium.org, dcaiafa+watch_chromium.org, simonmorris+watch_chromium.org, hclam+watch_chromium.org, wez+watch_chromium.org, amit, sanjeevr, garykac+watch_chromium.org, lambroslambrou+watch_chromium.org, rmsousa+watch_chromium.org, alexeypa+watch_chromium.org, sergeyu+watch_chromium.org
Visibility:
Public.

Description

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 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=166127

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : #

Total comments: 4

Patch Set 4 : #

Patch Set 5 : #

Patch Set 6 : #

Patch Set 7 : #

Patch Set 8 : #

Unified diffs Side-by-side diffs Delta from patch set Stats (+5600 lines, -16866 lines) Patch
M build/grit_action.gypi View 1 2 3 4 5 6 7 1 chunk +6 lines, -3 lines 0 comments Download
M remoting/base/resources_unittest.cc View 5 6 7 1 chunk +1 line, -1 line 0 comments Download
D remoting/grit_action.gypi View 1 5 6 7 1 chunk +0 lines, -32 lines 0 comments Download
M remoting/remoting.gyp View 1 2 3 4 5 6 7 7 chunks +94 lines, -89 lines 0 comments Download
M remoting/resources/string_resources.grd View 1 2 3 4 5 6 7 1 chunk +515 lines, -8 lines 0 comments Download
A remoting/resources/string_resources_ar.xtb View 1 2 3 4 5 6 7 1 chunk +115 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_bg.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_ca.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_cs.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_da.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_de.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_el.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_en-GB.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_en_US.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_es.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_es-419.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_et.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_fi.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_fil.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_fr.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_he.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_hi.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_hr.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_hu.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_id.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_it.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_ja.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_ko.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_lt.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_lv.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_nb.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_nl.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_pl.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_pt-BR.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_pt-PT.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_ro.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_ru.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_sk.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_sl.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_sr.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_sv.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_th.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_tr.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_uk.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_vi.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_zh-CN.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/resources/string_resources_zh-TW.xtb View 1 2 3 4 5 6 7 1 chunk +114 lines, -0 lines 0 comments Download
A remoting/tools/json_to_grd.py View 1 2 3 4 5 6 7 1 chunk +190 lines, -0 lines 0 comments Download
D remoting/tools/remove_official_branding.py View 1 2 3 4 5 6 7 1 chunk +0 lines, -46 lines 0 comments Download
D remoting/webapp/_locales.official/ar/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/bg/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/ca/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/cs/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/da/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/de/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/el/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/en/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/en_GB/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/es/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/es_419/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/et/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/fi/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/fil/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/fr/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/he/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/hi/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/hr/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/hu/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/id/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/it/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/ja/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/ko/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/lt/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/lv/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/nb/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/nl/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/pl/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/pt_BR/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/pt_PT/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/ro/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/ru/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/sk/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/sl/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/sr/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/sv/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/th/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/tr/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/uk/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/vi/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/zh_CN/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales.official/zh_TW/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -385 lines 0 comments Download
D remoting/webapp/_locales/en/messages.json View 1 2 3 4 5 6 7 1 chunk +0 lines, -507 lines 0 comments Download
M remoting/webapp/build-webapp.py View 1 2 3 4 5 6 7 1 chunk +5 lines, -10 lines 0 comments Download

Messages

Total messages: 14 (0 generated)
Sergey Ulanov
8 years, 1 month ago (2012-11-01 18:16:23 UTC) #1
Sergey Ulanov
+tony@
8 years, 1 month ago (2012-11-01 23:21:32 UTC) #2
tony
LGTM! I assume it builds (with no extra compiling) both with branding=Chrome and without. http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi ...
8 years, 1 month ago (2012-11-01 23:29:14 UTC) #3
Sergey Ulanov
http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi File build/grit_action.gypi (right): http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi#newcode19 build/grit_action.gypi:19: 'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids', On 2012/11/01 23:29:15, tony wrote: > Do ...
8 years, 1 month ago (2012-11-01 23:34:38 UTC) #4
tony
http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi File build/grit_action.gypi (right): http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi#newcode19 build/grit_action.gypi:19: 'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids', On 2012/11/01 23:34:38, sergeyu wrote: > On ...
8 years, 1 month ago (2012-11-01 23:36:51 UTC) #5
Sergey Ulanov
http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi File build/grit_action.gypi (right): http://codereview.chromium.org/11275101/diff/6001/build/grit_action.gypi#newcode19 build/grit_action.gypi:19: 'grit_resource_ids%': 'GRIT_DIR/../gritsettings/resource_ids', On 2012/11/01 23:36:51, tony wrote: > On ...
8 years, 1 month ago (2012-11-01 23:41:44 UTC) #6
tony
On 2012/11/01 23:41:44, sergeyu wrote: > % means don't override the variable if it's already ...
8 years, 1 month ago (2012-11-01 23:45:11 UTC) #7
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sergeyu@chromium.org/11275101/6002
8 years, 1 month ago (2012-11-01 23:48:53 UTC) #8
commit-bot: I haz the power
Change committed as 165605
8 years, 1 month ago (2012-11-02 02:54:03 UTC) #9
Lei Zhang
On 2012/11/02 02:54:03, I haz the power (commit-bot) wrote: > Change committed as 165605 Broke ...
8 years, 1 month ago (2012-11-02 03:33:39 UTC) #10
Sergey Ulanov
Will need to land a grid bugfix before I can land this CL: http://codereview.chromium.org/11312072/
8 years, 1 month ago (2012-11-03 00:39:14 UTC) #11
Sergey Ulanov
CL that introduced this bug was reverted (http://codereview.chromium.org/11150008). So I combined it with this CL ...
8 years, 1 month ago (2012-11-05 19:28:08 UTC) #12
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/sergeyu@chromium.org/11275101/14044
8 years, 1 month ago (2012-11-06 00:09:52 UTC) #13
commit-bot: I haz the power
8 years, 1 month ago (2012-11-06 03:39:24 UTC) #14
Change committed as 166127

Powered by Google App Engine
This is Rietveld 408576698