summaryrefslogtreecommitdiffstats
path: root/webkit/glue/resources/webkit_resources.grd
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 17:34:51 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-18 17:34:51 +0000
commitc1c58a016b365a58abc5f3efe614cb591326dfc4 (patch)
tree5a938a649c10b5e225ebc2524170625bb2cd4240 /webkit/glue/resources/webkit_resources.grd
parent1c4782d82417cd6b1329c1e4a86014866cc65ee7 (diff)
downloadchromium_src-c1c58a016b365a58abc5f3efe614cb591326dfc4.zip
chromium_src-c1c58a016b365a58abc5f3efe614cb591326dfc4.tar.gz
chromium_src-c1c58a016b365a58abc5f3efe614cb591326dfc4.tar.bz2
Make sure manifest specified shortcut for Extension Command can not override the
built-in shortcuts (for Views and GTK). User is still free to override manually. TBR=sky (already reviewed, except for the two line change, see below) BUG=226994 TEST=Automated test included. NOTE: This is the second attempt at landing, with only the ifdefs in accelerator_utils_views.cc added since last attempt (https://codereview.chromium.org/13044014). Tried building it locally where it failed before (on Win Aura and not) and it passed on both. Review URL: https://chromiumcodereview.appspot.com/14017017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194962 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/resources/webkit_resources.grd')
0 files changed, 0 insertions, 0 deletions