diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:53:37 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:53:37 +0000 |
| commit | 148d105e27c7c8c2cda0c81292690b9edafcae1f (patch) | |
| tree | e278052fc84a6e5399aec5bd0d423162aecb6d16 /chrome/browser/browser_main.cc | |
| parent | dc75d4823b598a9b9b313728a06f6b47d6a73929 (diff) | |
| download | chromium_src-148d105e27c7c8c2cda0c81292690b9edafcae1f.zip chromium_src-148d105e27c7c8c2cda0c81292690b9edafcae1f.tar.gz chromium_src-148d105e27c7c8c2cda0c81292690b9edafcae1f.tar.bz2 | |
This CL adds accelerators to the Linux toolkit views.
The MessageLoop had to be modified to support Dispatchers on Linux.
BUG=None
TEST=On Windows and Linux, make sure the accelerators still work as expected. On Linux toolkit views, build and run the unit-tests.
Review URL: http://codereview.chromium.org/159046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 302385d..3e85501 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -107,13 +107,13 @@ #include "net/http/http_network_layer.h" #include "printing/printed_document.h" #include "sandbox/src/sandbox.h" -#include "views/widget/accelerator_handler.h" #endif // defined(OS_WIN) #if defined(TOOLKIT_GTK) #include "chrome/common/gtk_util.h" #elif defined(TOOLKIT_VIEWS) #include "chrome/browser/views/chrome_views_delegate.h" +#include "views/focus/accelerator_handler.h" #endif namespace Platform { @@ -191,9 +191,11 @@ StringPiece NetResourceProvider(int key) { } void RunUIMessageLoop(BrowserProcess* browser_process) { -#if defined(OS_WIN) +#if defined(TOOLKIT_VIEWS) views::AcceleratorHandler accelerator_handler; MessageLoopForUI::current()->Run(&accelerator_handler); +#elif defined(OS_LINUX) + MessageLoopForUI::current()->Run(NULL); #elif defined(OS_POSIX) MessageLoopForUI::current()->Run(); #endif |