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

Unified Diff: chrome/browser/chromeos/login/touch_login_view.cc

Issue 7302015: A keyboard widget that manages itself (the animation and all that). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use the keyboard widget in the login screen too Created 9 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: chrome/browser/chromeos/login/touch_login_view.cc
diff --git a/chrome/browser/chromeos/login/touch_login_view.cc b/chrome/browser/chromeos/login/touch_login_view.cc
index bf0e55cdfc7ea551d3824dea8d960bad6f608f33..ea7d0253c56bfe0685f77d7bf510bab557bb0379 100644
--- a/chrome/browser/chromeos/login/touch_login_view.cc
+++ b/chrome/browser/chromeos/login/touch_login_view.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/renderer_host/render_widget_host_view_views.h"
#include "chrome/browser/ui/touch/frame/keyboard_container_view.h"
+#include "chrome/browser/ui/touch/keyboard/keyboard_manager.h"
#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
#include "chrome/browser/ui/views/dom_view.h"
#include "content/browser/tab_contents/tab_contents.h"
@@ -106,11 +107,18 @@ void TouchLoginView::InitVirtualKeyboard() {
}
void TouchLoginView::UpdateKeyboardAndLayout(bool should_show_keyboard) {
+#if 0
DCHECK(keyboard_);
if (should_show_keyboard == keyboard_showing_)
return;
keyboard_showing_ = should_show_keyboard;
Layout();
+#else
+ if (should_show_keyboard)
+ KeyboardManager::GetInstance()->ShowKeyboardForWidget(GetWidget());
+ else
+ KeyboardManager::GetInstance()->Hide();
+#endif
}
TouchLoginView::VirtualKeyboardType

Powered by Google App Engine
This is Rietveld 408576698