diff options
| -rw-r--r-- | chrome/app/chrome_command_ids.h | 21 | ||||
| -rw-r--r-- | chrome/app/chrome_dll.rc | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/accelerators_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/views/accelerator_table_gtk.cc | 1 |
5 files changed, 20 insertions, 10 deletions
diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h index ab5318a..53a53f5 100644 --- a/chrome/app/chrome_command_ids.h +++ b/chrome/app/chrome_command_ids.h @@ -160,16 +160,17 @@ #define IDC_ABOUT 40018 #define IDC_HELP_PAGE 40019 #define IDC_SHOW_APP_MENU 40020 -#define IDC_MANAGE_EXTENSIONS 40021 -#define IDC_DEV_TOOLS_INSPECT 40022 -#define IDC_UPGRADE_DIALOG 40023 -#define IDC_VIEW_INCOMPATIBILITIES 40024 -#define IDC_VIEW_BACKGROUND_PAGES 40025 -#define IDC_SHOW_KEYBOARD_OVERLAY 40026 -#define IDC_PROFILING_ENABLED 40027 -#define IDC_FILE_MANAGER 40028 -#define IDC_BOOKMARKS_MENU 40029 -#define IDC_SHOW_SYNC_SETUP 40030 +#define IDC_MANAGE_EXTENSIONS 40022 +#define IDC_AUTOFILL_DEFAULT 40023 +#define IDC_DEV_TOOLS_INSPECT 40025 +#define IDC_UPGRADE_DIALOG 40026 +#define IDC_VIEW_INCOMPATIBILITIES 40027 +#define IDC_VIEW_BACKGROUND_PAGES 40028 +#define IDC_SHOW_KEYBOARD_OVERLAY 40029 +#define IDC_PROFILING_ENABLED 40030 +#define IDC_FILE_MANAGER 40031 +#define IDC_BOOKMARKS_MENU 40032 +#define IDC_SHOW_SYNC_SETUP 40033 // Spell-check // Insert any additional suggestions before _LAST; these have to be consecutive. diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc index b617864..a19366b 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -33,6 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // pick those up in the WM_APPCOMMAND message. IDR_MAINFRAME ACCELERATORS BEGIN + "A", IDC_AUTOFILL_DEFAULT, VIRTKEY, CONTROL, SHIFT VK_LEFT, IDC_BACK, VIRTKEY, ALT VK_BACK, IDC_BACK, VIRTKEY "D", IDC_BOOKMARK_PAGE, VIRTKEY, CONTROL diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index d302941..9469c4b 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -3941,6 +3941,9 @@ void Browser::InitCommandState() { command_updater_.UpdateCommandEnabled(IDC_FIND_NEXT, !is_devtools()); command_updater_.UpdateCommandEnabled(IDC_FIND_PREVIOUS, !is_devtools()); + // Autofill + command_updater_.UpdateCommandEnabled(IDC_AUTOFILL_DEFAULT, !is_devtools()); + // Show various bits of UI command_updater_.UpdateCommandEnabled(IDC_CLEAR_BROWSING_DATA, normal_window); diff --git a/chrome/browser/ui/gtk/accelerators_gtk.cc b/chrome/browser/ui/gtk/accelerators_gtk.cc index b068e272..defd485 100644 --- a/chrome/browser/ui/gtk/accelerators_gtk.cc +++ b/chrome/browser/ui/gtk/accelerators_gtk.cc @@ -147,6 +147,10 @@ const struct AcceleratorMapping { { GDK_x, IDC_CUT, GDK_CONTROL_MASK }, { GDK_v, IDC_PASTE, GDK_CONTROL_MASK }, + // Autofill. + { GDK_a, IDC_AUTOFILL_DEFAULT, + GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, + // Miscellany. { GDK_d, IDC_BOOKMARK_ALL_TABS, GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) }, diff --git a/chrome/browser/ui/views/accelerator_table_gtk.cc b/chrome/browser/ui/views/accelerator_table_gtk.cc index a4c475b..984d48f 100644 --- a/chrome/browser/ui/views/accelerator_table_gtk.cc +++ b/chrome/browser/ui/views/accelerator_table_gtk.cc @@ -14,6 +14,7 @@ namespace browser { // the Windows accelerators in ../../app/chrome_dll.rc. const AcceleratorMapping kAcceleratorMap[] = { // Keycode Shift Ctrl Alt Command ID + { ui::VKEY_A, true, true, false, IDC_AUTOFILL_DEFAULT }, { ui::VKEY_LEFT, false, false, true, IDC_BACK }, { ui::VKEY_BACK, false, false, false, IDC_BACK }, #if defined(OS_CHROMEOS) |