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

Unified Diff: chrome/browser/ui/touch/frame/touch_browser_frame_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/ui/touch/frame/touch_browser_frame_view.cc
diff --git a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
index 344f921084dab25e9a24e2982935b5135f45398c..85ea0b0c7dd4d119dabbb9a39b88613abca79e3c 100644
--- a/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
+++ b/chrome/browser/ui/touch/frame/touch_browser_frame_view.cc
@@ -10,6 +10,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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/frame/browser_view.h"
#include "chrome/browser/ui/views/tab_contents/tab_contents_view_touch.h"
#include "content/browser/renderer_host/render_view_host.h"
@@ -172,14 +173,22 @@ void TouchBrowserFrameView::InitVirtualKeyboard() {
}
void TouchBrowserFrameView::UpdateKeyboardAndLayout(bool should_show_keyboard) {
+#if 0
if (should_show_keyboard)
InitVirtualKeyboard();
if (should_show_keyboard == keyboard_showing_)
return;
+#endif
- DCHECK(keyboard_);
+ if (should_show_keyboard) {
+ KeyboardManager::GetInstance()->ShowKeyboardForWidget(GetWidget());
+ } else {
+ KeyboardManager::GetInstance()->Hide();
+ }
+#if 0
+ DCHECK(keyboard_);
keyboard_showing_ = should_show_keyboard;
if (keyboard_showing_) {
// We don't re-layout the client view until the animation ends (see
@@ -199,6 +208,7 @@ void TouchBrowserFrameView::UpdateKeyboardAndLayout(bool should_show_keyboard) {
animation_->GetCurrentValue(), 0, keyboard_height_));
parent()->Layout();
}
+#endif
}
TouchBrowserFrameView::VirtualKeyboardType

Powered by Google App Engine
This is Rietveld 408576698