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

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 1177773002: Deprecating high-conflict accelerators (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixing comment in histograms.xml Created 5 years, 6 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:
Download patch
« no previous file with comments | « ash/system/system_notifier.cc ('k') | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index a11f843292c03458ebe64e632c6f16d4f0ad76d4..aac07651262451134c64fcf86873912ef6bf7884 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -15646,6 +15646,18 @@ After you create a new supervised user, you can manage their settings at any tim
Your printer is ready.
</message>
</if>
+
+ <!-- Deprecated Accelerators Messages -->
+ <if expr="chromeos">
+ <message name="IDS_DEPRECATED_LOCK_SCREEN_MSG"
Lei Zhang 2015/06/12 22:08:07 BTW, why is this in chrome/ and not in say, ash/re
afakhry 2015/06/12 22:36:20 Makes sense, I wasn't aware that there's an ash_st
+ desc="Notification message to tell users about the deprecation of Ctrl+Shift+L shortcut to lock the screen.">
+ Ctrl+Shift+L is deprecated. Please use Search+L instead.
+ </message>
+ <message name="IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG"
+ desc="Notification message to tell users about the deprecation of Shift+ESC shortcut to show the task manager.">
+ Shift+Esc is deprecated. Please use Search+Esc instead.
+ </message>
+ </if>
</messages>
</release>
</grit>
« no previous file with comments | « ash/system/system_notifier.cc ('k') | chrome/browser/resources/chromeos/keyboard_overlay_data.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698