diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:02:38 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-04 22:02:38 +0000 |
| commit | 3e1d64f89519254b96939bd035475c9128bc9162 (patch) | |
| tree | adaf24b8a046ab19b26bc7f84558224764063048 /chrome/chrome.gyp | |
| parent | 789e915d30f635f26016b30482d13bca2db6b12c (diff) | |
| download | chromium_src-3e1d64f89519254b96939bd035475c9128bc9162.zip chromium_src-3e1d64f89519254b96939bd035475c9128bc9162.tar.gz chromium_src-3e1d64f89519254b96939bd035475c9128bc9162.tar.bz2 | |
The initial registration of the browser accelerators for toolkit_views was sharing the accelerator table withe the GTK implementation.
It was missing some accelerators that are not defined in the table but in standard_menus.cc.
Turns out it's probably easier for toolkit_views and Gtk not to share that accelerator map.
I reverted the Gtk browser view to use a non shared accelerator table, and moved the accelerator table file to be toolkit_views specific.
BUG=None
TEST=Run Chrome (toolkit_views). Make sure accelerators (such as Ctrl-T, Ctrl-N...) work
Review URL: http://codereview.chromium.org/160544
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index d8de523..f53b26b 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -591,8 +591,6 @@ 'sources': [ # All .cc, .h, .m, and .mm files under browser except for tests and # mocks. - 'browser/accelerator_table_linux.cc', - 'browser/accelerator_table_linux.h', 'browser/alternate_nav_url_fetcher.cc', 'browser/alternate_nav_url_fetcher.h', 'browser/app_controller_mac.h', @@ -1667,6 +1665,8 @@ 'browser/views/about_ipc_dialog.h', 'browser/views/about_network_dialog.cc', 'browser/views/about_network_dialog.h', + 'browser/views/accelerator_table_gtk.cc', + 'browser/views/accelerator_table_gtk.h', 'browser/views/autocomplete/autocomplete_popup_contents_view.cc', 'browser/views/autocomplete/autocomplete_popup_contents_view.h', 'browser/views/autocomplete/autocomplete_popup_win.cc', @@ -2149,6 +2149,8 @@ ['include', '^browser/dock_info.cc'], ['include', '^browser/dock_info.h'], ['include', '^browser/extensions/'], + ['include', '^browser/views/accelerator_table_gtk.cc'], + ['include', '^browser/views/accelerator_table_gtk.h'], ['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.cc'], ['include', '^browser/views/autocomplete/autocomplete_popup_contents_view.h'], ['include', '^browser/views/autocomplete/autocomplete_popup_gtk.cc'], |