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

Unified Diff: ui/wm/test/wm_test_helper.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux 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
Index: ui/wm/test/wm_test_helper.cc
diff --git a/ui/wm/test/wm_test_helper.cc b/ui/wm/test/wm_test_helper.cc
index c74ddfe7f1805e1665b953dbf2b61102309d8fb9..83166be9aad299bf55f6cd06a027acfae24242e0 100644
--- a/ui/wm/test/wm_test_helper.cc
+++ b/ui/wm/test/wm_test_helper.cc
@@ -10,7 +10,6 @@
#include "ui/aura/window.h"
#include "ui/wm/core/compound_event_filter.h"
#include "ui/wm/core/default_activation_client.h"
-#include "ui/wm/core/input_method_event_filter.h"
namespace wm {
@@ -28,11 +27,6 @@ WMTestHelper::WMTestHelper(const gfx::Size& default_window_size,
root_window_event_filter_.reset(new wm::CompoundEventFilter);
host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
- input_method_filter_.reset(new wm::InputMethodEventFilter(
- host_->GetAcceleratedWidget()));
- input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
- root_window_event_filter_->AddHandler(input_method_filter_.get());
-
new wm::DefaultActivationClient(host_->window());
capture_client_.reset(
@@ -40,7 +34,6 @@ WMTestHelper::WMTestHelper(const gfx::Size& default_window_size,
}
WMTestHelper::~WMTestHelper() {
- root_window_event_filter_->RemoveHandler(input_method_filter_.get());
}
aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context,
« ui/aura/window_tree_host.cc ('K') | « ui/wm/test/wm_test_helper.h ('k') | ui/wm/wm.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698