Merge 260900 "linux_aura: Port GtkKeybindingsHandler to Aura."

content/public/browser/native_web_keyboard_event.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
 #define CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
@@ skipping 49 matching lines @@
 
   gfx::NativeEvent os_event;
 
   // True if the browser should ignore this event if it's not handled by the
   // renderer. This happens for RawKeyDown events that are created while IME is
   // active and is necessary to prevent backspace from doing "history back" if
   // it is hit in ime mode.
   // Currently, it's only used by Linux and Mac ports.
   bool skip_in_browser;
 
-#if defined(TOOLKIT_GTK)
+#if defined(USE_AURA) || defined(TOOLKIT_GTK)
   // True if the key event matches an edit command. In order to ensure the edit
   // command always work in web page, the browser should not pre-handle this key
   // event as a reserved accelerator. See http://crbug.com/54573
   bool match_edit_command;
 #endif
 };
 
 // Returns a bitmak of values from ui/events/event_constants.h.
 CONTENT_EXPORT int GetModifiersFromNativeWebKeyboardEvent(
     const NativeWebKeyboardEvent& event);
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_NATIVE_WEB_KEYBOARD_EVENT_H_