Implementing accelerators for Linux toolkit_views

chrome/browser/browser_main.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "build/build_config.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 89 matching lines @@
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/version.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
 #include "net/base/winsock_init.h"
 #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 {
 
 void WillInitializeMainMessageLoop(const CommandLine & command_line);
 void WillTerminate();
 
 #if defined(OS_WIN) || defined(OS_LINUX)
 // Perform any platform-specific work that needs to be done before the main
 // message loop is created and initialized.
@@ skipping 57 matching lines @@
 
 // This is called indirectly by the network layer to access resources.
 StringPiece NetResourceProvider(int key) {
   if (IDR_DIR_HEADER_HTML == key)
     return StringPiece(lazy_dir_lister.Pointer()->html_data);
 
   return ResourceBundle::GetSharedInstance().GetRawDataResource(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
 }
 
 #if defined(OS_POSIX)
 // See comment below, where sigaction is called.
 void SIGCHLDHandler(int signal) {
 }
 
@@ skipping 586 matching lines @@
   if (metrics)
     metrics->Stop();
 
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   browser_process.release();
   browser_shutdown::Shutdown();
 
   return result_code;
 }