Aura: Support non-global keyboard shortcuts.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index c8dabf0b28ff1d130c8ea9597354285952d2ec4e..0c5d28611f36385f5824dbbf0b703acff7a626c0 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -106,6 +106,7 @@
 #include "views/window/dialog_delegate.h"
 
 #if defined(USE_AURA)
+#include "chrome/browser/ui/views/accelerator_table_linux.h"

[mazda, 2011/10/28 14:44:33]

Now that this header is used for win_aura as well, so I renamed it to
accelerator_table.h

 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/aura/launcher_icon_updater.h"
 #include "ui/aura_shell/launcher/launcher.h"
@@ -116,7 +117,6 @@
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
 #include "ui/base/message_box_win.h"
-#include "views/widget/native_widget_win.h"
 #elif defined(TOOLKIT_USES_GTK)
 #include "chrome/browser/ui/views/accelerator_table_linux.h"
 #include "views/window/hit_test.h"
@@ -132,6 +132,10 @@
 #include "chrome/browser/ui/views/download/download_shelf_view.h"
 #endif
 
+#if defined(OS_WIN)
+#include "views/widget/native_widget_win.h"

[Ben Goodger (Google), 2011/10/27 15:33:01]

This is wrong. We don't build this file on OS_WIN && USE_AURA... you need to
move this back to the previous section.

[mazda, 2011/10/28 14:44:33]

Done.

+#endif
+
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/base/view_prop.h"
 #endif
@@ -2299,10 +2303,7 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
 }
 
 void BrowserView::LoadAccelerators() {
-#if defined(USE_AURA)
-  // TODO(beng):
-  NOTIMPLEMENTED();
-#elif defined(OS_WIN)
+#if defined(OS_WIN)

[Ben Goodger (Google), 2011/10/27 15:33:01]

What I meant here was can we use the Linux accelerator logic for USE_AURA &&
OS_WIN... it looked pretty portable.

[mazda, 2011/10/28 14:44:33]

Ah, I understood.
I fixed it and checked that shortcut keys worked on Windows as well.

   HACCEL accelerator_table = AtlLoadAccelerators(IDR_MAINFRAME);
   DCHECK(accelerator_table);