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

Unified Diff: chrome/browser/chromeos/input_method/candidate_window.cc

Issue 10919236: Support multi display candidate window. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 3 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: chrome/browser/chromeos/input_method/candidate_window.cc
diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index 455d643e20763cde4852568bd982700f255dbc2d..5c8ee79066eb95b495f5ae05459ecb4df2da226a 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -35,6 +35,7 @@
#if defined(USE_ASH)
#include "ash/shell.h"
#include "ash/shell_window_ids.h"
+#include "ash/wm/coordinate_conversion.h"
#include "ash/wm/window_animations.h"
#endif // USE_ASH
@@ -1669,6 +1670,18 @@ void CandidateWindowControllerImpl::OnSetCursorLocation(
return;
}
+#if defined(USE_ASH)
+ aura::RootWindow* root_window =
+ ash::wm::GetRootWindowAt(cursor_location.origin());
+ if (root_window) {
+ gfx::NativeView current_container = ash::Shell::GetContainer(
+ root_window,
+ ash::internal::kShellWindowId_InputMethodContainer);
+ views::Widget::ReparentNativeView(frame_->GetNativeView(),
mazda 2012/09/12 16:49:45 Is it necessary to do this here? I think ScreenPos
Seigo Nonaka 2012/09/12 17:24:50 Seems transient window like CandidateWindow does n
+ current_container);
+ }
+#endif
+
// Remember the cursor location.
candidate_window_->set_cursor_location(cursor_location);
candidate_window_->set_composition_head_location(composition_head);
« 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