Aura under Linux

chrome/browser/ui/views/html_dialog_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/html_dialog_view.h"
 
 #include <vector>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser_dialogs.h"
@@ skipping 194 matching lines @@
 
 // A simplified version of BrowserView::HandleKeyboardEvent().
 // We don't handle global keyboard shortcuts here, but that's fine since
 // they're all browser-specific. (This may change in the future.)
 void HtmlDialogView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
 #if defined(OS_WIN)
   // Any unhandled keyboard/character messages should be defproced.
   // This allows stuff like F10, etc to work correctly.
   DefWindowProc(event.os_event.hwnd, event.os_event.message,
                   event.os_event.wParam, event.os_event.lParam);
-#elif defined(TOOLKIT_USES_GTK)
+#elif defined(TOOLKIT_USES_GTK) && !defined(USE_AURA)

[Ben Goodger (Google), 2011/09/16 01:11:18]

In these circumstances I prefer the following flow:

#if defined(USE_AURA)
..
#elif defined(OS_WIN)
..
#elif defined(TOOLKIT_USES_GTK)
..
#endif

[Emmanuel Saint-loubert-Bié, 2011/09/16 02:34:54]

Yes much cleaner!

+  // TODO(saintlou): provide some Aura handling.
   views::NativeWidgetGtk* window_gtk =
       static_cast<views::NativeWidgetGtk*>(GetWidget()->native_widget());
   if (event.os_event && !event.skip_in_browser) {
     views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
     window_gtk->HandleKeyboardEvent(views_event);
   }
 #endif
 }
 
 void HtmlDialogView::CloseContents(TabContents* source) {
@@ skipping 55 matching lines @@
       break;
     default:
       NOTREACHED() << "unknown type" << type;
   }
 }
 
 void HtmlDialogView::RegisterDialogAccelerators() {
   // Pressing the ESC key will close the dialog.
   AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
 }