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

Unified Diff: ui/keyboard/keyboard_controller.cc

Issue 527153002: Fix the issue that GetFrameWindow() may change between AddObserver and RemoveObserver in KeyboardCo… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « no previous file | no next file » | 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 ceef5941f7e424a9e912a7ad8ee0f8fe9ff73751..801c68ca5910a7a027e125ca05e26d346bf9fff5 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -143,11 +143,9 @@ void ToggleTouchEventLogging(bool enable) {
}
aura::Window *GetFrameWindow(aura::Window *window) {
- // Each container window has a non-negative id. Stop traversing at the child
- // of a container window.
if (!window)
return NULL;
- while(window->parent() && window->parent()->id() < 0) {
Shu Chen 2014/09/02 04:43:42 Kevin/Biao, do you think there is a case that a to
bshe 2014/09/02 12:58:47 I am not familiar with this code. kevers@ could co
Shu Chen 2014/09/02 14:30:43 Done. I've changed to safer solution.
+ while(window->parent()) {
window = window->parent();
}
return window;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698