Aura: Support non-global keyboard shortcuts.

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

 // Copyright (c) 2011 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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 88 matching lines @@
 #include "views/events/event.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #include "views/layout/grid_layout.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #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"
 #include "ui/aura_shell/launcher/launcher_model.h"
 #include "ui/aura_shell/shell.h"
 #include "ui/base/view_prop.h"
 #elif defined(OS_WIN)
 #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"
 #if !defined(TOUCH_UI)
 #include "chrome/browser/ui/views/handle_web_keyboard_event.h"
 #endif
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #else
 #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
 
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/touch/status_bubble_touch.h"
 #endif
 
 using base::TimeDelta;
 using views::ColumnSet;
@@ skipping 2147 matching lines @@
   // it's in its final position.
   ignore_layout_ = false;
   Layout();
 #if defined(OS_WIN) && !defined(USE_AURA)
   static_cast<views::NativeWidgetWin*>(frame_->native_widget())->
       PopForceHidden();
 #endif
 }
 
 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);
 
   // We have to copy the table to access its contents.
   int count = CopyAcceleratorTable(accelerator_table, 0, 0);
   if (count == 0) {
     // Nothing to do in that case.
     return;
   }
 
@@ skipping 308 matching lines @@
   Bubble::Show(this->GetWidget(), bounds,
                views::BubbleBorder::TOP_RIGHT,
                bubble_view, bubble_view);
 }
 
 void BrowserView::ShowAvatarBubbleFromAvatarButton() {
   AvatarMenuButton* button = frame_->GetAvatarMenuButton();
   if (button)
     button->ShowAvatarBubble();
 }