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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_gtk.cc

Issue 7548008: Use input method's context for tracking focus states in OnGrabNotify. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Correction in a comment Created 9 years, 4 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
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_gtk.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/render_widget_host_view_gtk.cc
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 53de2bbac58d22d54166c9cfffafb5e9d59c85f3..bb7f266585d8dafe3cb12a0da343cddca641dc62 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -216,7 +216,7 @@ class RenderWidgetHostViewGtkWidget {
host_view->GetRenderWidgetHost()->Blur();
// Prevents us from stealing input context focus in OnGrabNotify() handler.
- host_view->was_focused_before_grab_ = false;
+ host_view->was_imcontext_focused_before_grab_ = false;
// Disable the GtkIMContext object.
host_view->im_context_->OnFocusOut();
@@ -231,11 +231,12 @@ class RenderWidgetHostViewGtkWidget {
static void OnGrabNotify(GtkWidget* widget, gboolean was_grabbed,
RenderWidgetHostViewGtk* host_view) {
if (was_grabbed) {
- if (host_view->was_focused_before_grab_)
+ if (host_view->was_imcontext_focused_before_grab_)
host_view->im_context_->OnFocusIn();
} else {
- host_view->was_focused_before_grab_ = host_view->HasFocus();
- if (host_view->was_focused_before_grab_) {
+ host_view->was_imcontext_focused_before_grab_ =
+ host_view->im_context_->is_focused();
+ if (host_view->was_imcontext_focused_before_grab_) {
gdk_window_set_cursor(widget->window, NULL);
host_view->im_context_->OnFocusOut();
}
@@ -509,7 +510,7 @@ RenderWidgetHostViewGtk::RenderWidgetHostViewGtk(RenderWidgetHost* widget_host)
overlay_animation_(this),
parent_(NULL),
is_popup_first_mouse_release_(true),
- was_focused_before_grab_(false),
+ was_imcontext_focused_before_grab_(false),
do_x_grab_(false),
is_fullscreen_(false),
destroy_handler_id_(0),
« no previous file with comments | « chrome/browser/renderer_host/render_widget_host_view_gtk.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698