7 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 6e1c196..deaaf56 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -141,9 +141,9 @@ void SearchProviderTest::RunTillProviderDone() {
     return;
 
   quit_when_done_ = true;
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
   message_loop_.Run(NULL);
-#elif defined(OS_POSIX)
+#else
   message_loop_.Run();
 #endif
 }
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
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index 8cf23fd..b4f1052 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -25,7 +25,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "views/controls/message_box_view.h"
-#include "views/widget/accelerator_handler.h"
+#include "views/focus/accelerator_handler.h"
 #include "views/window/window.h"
 
 // Displays a warning message if the user is running chrome on windows 2000.
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
index a00f456..30b6df32 100644
--- a/chrome/browser/first_run_win.cc
+++ b/chrome/browser/first_run_win.cc
@@ -56,9 +56,9 @@
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/link.h"
+#include "views/focus/accelerator_handler.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
-#include "views/widget/accelerator_handler.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"
 #include "views/window/window.h"
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 2c2d0bb..2e27833 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -46,12 +46,12 @@
     # TODO(jcampan): move these vars to views.gyp.
     'views_unit_tests_sources': [
       '../views/view_unittest.cc',
+      '../views/focus/focus_manager_unittest.cc',
     ],
     'views_unit_tests_sources_win_specific': [
       # TODO(jcampan): make the following tests work on Linux.
       '../views/controls/label_unittest.cc',
       '../views/controls/table/table_view_unittest.cc',
-      '../views/focus/focus_manager_unittest.cc',
       '../views/grid_layout_unittest.cc',
     ]
   },
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 8aab9f8..0158700 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -156,9 +156,6 @@ struct ViewHostMsg_DidPrintPage_Params;
 
 namespace views {
 
-class AcceleratorHandler {
-};
-
 #if !defined(TOOLKIT_VIEWS)
 class MenuItemView {
  public:
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index ee9b7d4..928ff87 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -18,8 +18,8 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
-#if defined (OS_WIN)
-#include "views/widget/accelerator_handler.h"
+#if defined(TOOLKIT_VIEWS)
+#include "views/focus/accelerator_handler.h"
 #endif
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
@@ -260,9 +260,11 @@ void RunMessageLoop() {
   MessageLoopForUI* loop = MessageLoopForUI::current();
   bool did_allow_task_nesting = loop->NestableTasksAllowed();
   loop->SetNestableTasksAllowed(true);
-#if defined (OS_WIN)
+#if defined(TOOLKIT_VIEWS)
   views::AcceleratorHandler handler;
   loop->Run(&handler);
+#elif defined(OS_LINUX)
+  loop->Run(NULL);
 #else
   loop->Run();
 #endif