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 118 matching lines @@
 #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) && !defined(USE_AURA)
 #include "ui/base/view_prop.h"
 #endif
 
+#if defined(OS_LINUX) && defined(USE_AURA)

[Ben Goodger (Google), 2011/10/26 19:06:04]

Will this build & run on Windows too? If so, let's just have this be #if
defined(USE_AURA)

[mazda, 2011/10/27 13:05:05]

Done.

+#include "chrome/browser/ui/views/accelerator_table_linux.h"
+#endif
+
 #if defined(TOUCH_UI)
 #include "chrome/browser/ui/touch/status_bubble_touch.h"
 #endif
 
 using base::TimeDelta;
 using views::ColumnSet;
 using views::GridLayout;
 
 // The height of the status bubble.
 static const int kStatusBubbleHeight = 20;
@@ skipping 2143 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)
+#if defined(OS_WIN) && defined(USE_AURA)

[Ben Goodger (Google), 2011/10/26 19:06:04]

same comment here.

I'd like to share as much in common as possible between the win & linux paths
for aura.

[mazda, 2011/10/27 13:05:05]

Done.

   // TODO(beng):
   NOTIMPLEMENTED();
 #elif defined(OS_WIN)
   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.
@@ skipping 311 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();
 }