7 files changed, 6 insertions, 34 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index ad43be4..302385d 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -192,7 +192,8 @@ StringPiece NetResourceProvider(int key) {
 
 void RunUIMessageLoop(BrowserProcess* browser_process) {
 #if defined(OS_WIN)
-  MessageLoopForUI::current()->Run(browser_process->accelerator_handler());
+  views::AcceleratorHandler accelerator_handler;
+  MessageLoopForUI::current()->Run(&accelerator_handler);
 #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 b86df5f..8cf23fd 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -44,7 +44,8 @@ bool CheckForWin2000() {
 int AskForUninstallConfirmation() {
   int ret = ResultCodes::NORMAL_EXIT;
   UninstallDialog::ShowUninstallDialog(ret);
-  MessageLoopForUI::current()->Run(g_browser_process->accelerator_handler());
+  views::AcceleratorHandler accelerator_handler;
+  MessageLoopForUI::current()->Run(&accelerator_handler);
   return ret;
 }
 
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 63a7412..281e330 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -40,9 +40,6 @@ class BrokerServices;
 namespace printing {
 class PrintJobManager;
 }
-namespace views {
-class AcceleratorHandler;
-}
 
 // NOT THREAD SAFE, call only from the main thread.
 // These functions shouldn't return NULL unless otherwise noted.
@@ -122,8 +119,6 @@ class BrowserProcess {
 
   virtual bool IsShuttingDown() = 0;
 
-  virtual views::AcceleratorHandler* accelerator_handler() = 0;
-
   virtual printing::PrintJobManager* print_job_manager() = 0;
 
   virtual GoogleURLTracker* google_url_tracker() = 0;
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 46d86f1..552e171 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -36,7 +36,6 @@
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "views/focus/view_storage.h"
-#include "views/widget/accelerator_handler.h"
 #elif defined(OS_POSIX)
 // TODO(port): Remove the temporary scaffolding as we port the above headers.
 #include "chrome/common/temp_scaffolding_stubs.h"
@@ -390,17 +389,6 @@ void BrowserProcessImpl::CreateDevToolsManager() {
   devtools_manager_ = new DevToolsManager();
 }
 
-void BrowserProcessImpl::CreateAcceleratorHandler() {
-#if defined(OS_WIN)
-  DCHECK(accelerator_handler_.get() == NULL);
-  scoped_ptr<views::AcceleratorHandler> accelerator_handler(
-      new views::AcceleratorHandler);
-  accelerator_handler_.swap(accelerator_handler);
-#else
-  // TODO(port): remove this completely, it has no business being here.
-#endif
-}
-
 void BrowserProcessImpl::CreateGoogleURLTracker() {
   DCHECK(google_url_tracker_.get() == NULL);
   scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker);
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index d33c493..421ba03 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -169,13 +169,6 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
     return 0 == module_ref_count_;
   }
 
-  virtual views::AcceleratorHandler* accelerator_handler() {
-    DCHECK(CalledOnValidThread());
-    if (!accelerator_handler_.get())
-      CreateAcceleratorHandler();
-    return accelerator_handler_.get();
-  }
-
   virtual printing::PrintJobManager* print_job_manager();
 
   virtual GoogleURLTracker* google_url_tracker() {
@@ -211,7 +204,6 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
   void CreateIconManager();
   void CreateDebuggerWrapper(int port);
   void CreateDevToolsManager();
-  void CreateAcceleratorHandler();
   void CreateGoogleURLTracker();
 
   void InitBrokerServices(sandbox::BrokerServices* broker_services);
@@ -257,8 +249,6 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
 
   scoped_ptr<AutomationProviderList> automation_provider_list_;
 
-  scoped_ptr<views::AcceleratorHandler> accelerator_handler_;
-
   scoped_ptr<GoogleURLTracker> google_url_tracker_;
 
   scoped_ptr<NotificationService> main_notification_service_;
diff --git a/chrome/browser/first_run_win.cc b/chrome/browser/first_run_win.cc
index 18b0a44..a00f456 100644
--- a/chrome/browser/first_run_win.cc
+++ b/chrome/browser/first_run_win.cc
@@ -365,7 +365,8 @@ bool OpenFirstRunDialog(Profile* profile,
   // is closed) so that the window can receive messages and we block the
   // browser window from showing up. We pass the accelerator handler here so
   // that keyboard accelerators (Enter, Esc, etc) work in the dialog box.
-  MessageLoopForUI::current()->Run(g_browser_process->accelerator_handler());
+  views::AcceleratorHandler accelerator_handler;
+  MessageLoopForUI::current()->Run(&accelerator_handler);
   process_singleton->Unlock();
 
   return first_run_view->accepted();
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index cc0ef76..2391a53 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -123,10 +123,6 @@ class TestingBrowserProcess : public BrowserProcess {
     return false;
   }
 
-  virtual views::AcceleratorHandler* accelerator_handler() {
-    return NULL;
-  }
-
   virtual printing::PrintJobManager* print_job_manager() {
     return NULL;
   }