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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 11230050: ash : introduce second SessionStateController implementation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merge with TOT, review fixes Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/session_state_controller_impl2.cc ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <!-- 3 <!--
4 This file contains definitions of resources that will be translated for each 4 This file contains definitions of resources that will be translated for each
5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available 5 locale. The variables is_win, is_macosx, is_linux, and is_posix are available
6 for making strings OS specific. Other platform defines such as use_titlecase 6 for making strings OS specific. Other platform defines such as use_titlecase
7 are declared in build/common.gypi. 7 are declared in build/common.gypi.
8 --> 8 -->
9 9
10 <grit base_dir="." latest_public_release="0" current_release="1" 10 <grit base_dir="." latest_public_release="0" current_release="1"
(...skipping 6444 matching lines...) Expand 10 before | Expand all | Expand 10 after
6455 </message> 6455 </message>
6456 <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION" desc=" Description for the flag to switch wallpaper boot animation function."> 6456 <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION_DESCRIPTION" desc=" Description for the flag to switch wallpaper boot animation function.">
6457 Change boot animation function. 6457 Change boot animation function.
6458 </message> 6458 </message>
6459 <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2" desc="Description for the option of boot animation function."> 6459 <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2" desc="Description for the option of boot animation function.">
6460 EASE_OUT_2 6460 EASE_OUT_2
6461 </message> 6461 </message>
6462 <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3" desc="Description for the option of boot animation function."> 6462 <message name="IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3" desc="Description for the option of boot animation function.">
6463 EASE_OUT_3 6463 EASE_OUT_3
6464 </message> 6464 </message>
6465 <message name="IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS" desc="Name for the fla g to switch lock animations.">
6466 New lock animations.
6467 </message>
6468 <message name="IDS_FLAGS_ASH_NEW_LOCK_ANIMATIONS_DESCRIPTION" desc="Desc ription for the flag to switch lock animations.">
6469 Enables new lock animations.
6470 </message>
6465 </if> 6471 </if>
6466 6472
6467 <message name="IDS_FLAGS_OLD_CHECKBOX_STYLE" desc="Name of the flag to tur n off the new checkbox style."> 6473 <message name="IDS_FLAGS_OLD_CHECKBOX_STYLE" desc="Name of the flag to tur n off the new checkbox style.">
6468 Disable new checkbox style. 6474 Disable new checkbox style.
6469 </message> 6475 </message>
6470 <message name="IDS_FLAGS_OLD_CHECKBOX_STYLE_DESCRIPTION" desc="Description of the flag to turn off the new checkbox style."> 6476 <message name="IDS_FLAGS_OLD_CHECKBOX_STYLE_DESCRIPTION" desc="Description of the flag to turn off the new checkbox style.">
6471 Disables new appearance and sizing behavior for checkboxes and radio but tons. 6477 Disables new appearance and sizing behavior for checkboxes and radio but tons.
6472 </message> 6478 </message>
6473 <message name="IDS_FLAGS_DISABLE_NON_FULLSCREEN_MOUSE_LOCK_NAME" desc="Nam e for the flag to disable mouse lock when the browser is not full screen."> 6479 <message name="IDS_FLAGS_DISABLE_NON_FULLSCREEN_MOUSE_LOCK_NAME" desc="Nam e for the flag to disable mouse lock when the browser is not full screen.">
6474 Disable non full screen mouse lock. 6480 Disable non full screen mouse lock.
(...skipping 8339 matching lines...) Expand 10 before | Expand all | Expand 10 after
14814 14820
14815 <structures fallback_to_english="true"> 14821 <structures fallback_to_english="true">
14816 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. --> 14822 <!-- Make sure these stay in sync with the structures in generated_resourc es.grd. -->
14817 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" > 14823 <structure name="IDD_CHROME_FRAME_FIND_DIALOG" file="cf_resources.rc" type ="dialog" >
14818 </structure> 14824 </structure>
14819 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" > 14825 <structure name="IDD_CHROME_FRAME_READY_PROMPT" file="cf_resources.rc" typ e="dialog" >
14820 </structure> 14826 </structure>
14821 </structures> 14827 </structures>
14822 </release> 14828 </release>
14823 </grit> 14829 </grit>
OLDNEW
« no previous file with comments | « ash/wm/session_state_controller_impl2.cc ('k') | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698