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

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 2666843003: Disable pinch-to-zoom gesture on virtual keyboard (Closed)
Patch Set: rebase Created 3 years, 11 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 | « ui/keyboard/keyboard_controller.h ('k') | ui/keyboard/keyboard_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_controller.cc
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 638bd29f149b5923f4552bbd8fa47c6c7f70a058..86e3822eeca8f44547935865316751e53b6cf9c4 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -188,6 +188,7 @@ KeyboardController::~KeyboardController() {
if (container_->GetRootWindow())
container_->GetRootWindow()->RemoveObserver(this);
container_->RemoveObserver(this);
+ container_->RemovePreTargetHandler(&event_filter_);
}
if (input_method_)
input_method_->RemoveObserver(this);
@@ -216,6 +217,7 @@ aura::Window* KeyboardController::GetContainerWindow() {
container_->Init(ui::LAYER_NOT_DRAWN);
container_->AddObserver(this);
container_->SetLayoutManager(new KeyboardLayoutManager(this));
+ container_->AddPreTargetHandler(&event_filter_);
}
return container_.get();
}
« no previous file with comments | « ui/keyboard/keyboard_controller.h ('k') | ui/keyboard/keyboard_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698