Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7889)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 6675005: Integrate the new input method API for Views into Chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove redundant check of focus state. Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 bdac4b38da1fc5bef3731c27465df54018074fee..440a1212bced0dad3eb687af525a2f6f0c7dee52 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -79,6 +79,7 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas_skia.h"
#include "views/controls/single_split_view.h"
+#include "views/events/event.h"
#include "views/focus/external_focus_tracker.h"
#include "views/focus/view_storage.h"
#include "views/layout/grid_layout.h"
@@ -1258,8 +1259,10 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
#if defined(OS_LINUX) && !defined(TOUCH_UI)
views::Window* window = GetWidget()->GetWindow();
- if (window && event.os_event && !event.skip_in_browser)
- static_cast<views::WindowGtk*>(window)->HandleKeyboardEvent(event.os_event);
+ if (window && event.os_event && !event.skip_in_browser) {
+ views::KeyEvent views_event(reinterpret_cast<GdkEvent*>(event.os_event));
+ static_cast<views::WindowGtk*>(window)->HandleKeyboardEvent(views_event);
+ }
#else
unhandled_keyboard_event_handler_.HandleKeyboardEvent(event,
GetFocusManager());

Powered by Google App Engine
This is Rietveld 408576698