summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 22:06:38 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 22:06:38 +0000
commit439b4260a003c5ac37ce361cfa4481b6256f2c5e (patch)
tree411edf2f09d1862b010ec5f8e1688ddba3a9d9da
parente70638af60d23030cc0d77510b5361278a6dfe5c (diff)
downloadchromium_src-439b4260a003c5ac37ce361cfa4481b6256f2c5e.zip
chromium_src-439b4260a003c5ac37ce361cfa4481b6256f2c5e.tar.gz
chromium_src-439b4260a003c5ac37ce361cfa4481b6256f2c5e.tar.bz2
chromeos: Hashes for user actions originating outside Chrome.
BUG=chromium-os:8,chromium-os:10403 TEST=none Review URL: http://codereview.chromium.org/6050017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70787 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/tools/chromeactions.txt6
-rwxr-xr-xchrome/tools/extract_actions.py10
2 files changed, 16 insertions, 0 deletions
diff --git a/chrome/tools/chromeactions.txt b/chrome/tools/chromeactions.txt
index 2f8ef6c..c0a80df 100644
--- a/chrome/tools/chromeactions.txt
+++ b/chrome/tools/chromeactions.txt
@@ -27,6 +27,8 @@
0x46299b11fb76c5d3 Accel_Back_Backspace
0x942956b3c704a9a2 Accel_Back_F1
0x651680cc43f0574d Accel_Back_Left
+0x9d53a3047a707543 Accel_BrightnessDown_F6
+0xb05e783429d6cfac Accel_BrightnessUp_F7
0x7f2c75700d286c16 Accel_FocusLocation_D
0xe566241731cecfbb Accel_FocusLocation_L
0xb4f736d60280d914 Accel_FocusSearch_E
@@ -36,6 +38,10 @@
0xad7e6131ff6f2528 Accel_Forward_Right
0x36adab865c373745 Accel_Fullscreen_F4
0x5e6bce93ecde1df8 Accel_NewTab_T
+0x5a27559e6846a75e Accel_NextWindow_F5
+0xc217e3bb30e9a004 Accel_NextWindow_Tab
+0x2e92845dc8edee91 Accel_PrevWindow_F5
+0x49b33857117c4c43 Accel_PrevWindow_Tab
0xa2654c422408df28 Accel_Reload_F3
0x6db94baf96eb6cfd Accel_Reload_R
0xe315330404ef14a8 Accel_Search_LWin
diff --git a/chrome/tools/extract_actions.py b/chrome/tools/extract_actions.py
index 3517183..9027620 100755
--- a/chrome/tools/extract_actions.py
+++ b/chrome/tools/extract_actions.py
@@ -133,6 +133,16 @@ def AddComputedActions(actions):
actions.add('LanguageOptions_UiLanguageChange_%s' % language_code)
actions.add('LanguageOptions_SpellCheckLanguageChange_%s' % language_code)
+ # Actions sent by the Chrome OS window manager.
+ actions.add('Accel_NextWindow_Tab')
+ actions.add('Accel_PrevWindow_Tab')
+ actions.add('Accel_NextWindow_F5')
+ actions.add('Accel_PrevWindow_F5')
+
+ # Actions sent by the Chrome OS power manager.
+ actions.add('Accel_BrightnessDown_F6')
+ actions.add('Accel_BrightnessUp_F7')
+
def AddWebKitEditorActions(actions):
"""Add editor actions from editor_client_impl.cc.