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

Unified Diff: ash/display/display_controller.cc

Issue 1209663002: Use EventHandler for IME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « ash/display/display_controller.h ('k') | ash/host/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_controller.cc
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc
index 9e352fe72dfb7e392b5314c8a2670bc658fa5c46..f2f84eaef248348f2cc531527d1fa68133ad3588 100644
--- a/ash/display/display_controller.cc
+++ b/ash/display/display_controller.cc
@@ -17,6 +17,7 @@
#include "ash/host/ash_window_tree_host.h"
#include "ash/host/ash_window_tree_host_init_params.h"
#include "ash/host/root_window_transformer.h"
+#include "ash/ime/input_method_event_handler.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/root_window_controller.h"
@@ -894,8 +895,11 @@ AshWindowTreeHost* DisplayController::AddWindowTreeHostForDisplay(
if (!input_method_) { // Singleton input method instance for Ash.
input_method_ = ui::CreateInputMethod(this, host->GetAcceleratedWidget());
input_method_->OnFocus();
+ input_method_event_handler_.reset(
+ new InputMethodEventHandler(input_method_.get()));
}
host->SetSharedInputMethod(input_method_.get());
+ ash_host->set_input_method_handler(input_method_event_handler_.get());
host->window()->SetName(base::StringPrintf(
"%sRootWindow-%d", params_with_bounds.offscreen ? "Offscreen" : "",
« no previous file with comments | « ash/display/display_controller.h ('k') | ash/host/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698