Separate Virtual Keyboard related conditionals from TouchUI

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index b52d671e06e1c734342637b85070f678fbf6fb5b..100b5fa91324a0d2dc8e27c5ca9227b221470b8f 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -44,6 +44,10 @@
 #include "views/widget/root_view.h"
 #include "views/window/window_shape.h"
 
+#if defined(USE_VIRTUAL_KEYBOARD)
+#include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
+#endif
+
 #if !defined(OS_WIN)
 #include "views/window/hit_test.h"
 #endif
@@ -207,6 +211,11 @@ OpaqueBrowserFrameView::OpaqueBrowserFrameView(BrowserFrame* frame,
     registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
                    NotificationService::AllSources());
   }
+
+#if defined(USE_VIRTUAL_KEYBOARD)
+  // Make sure the singleton VirtualKeyboardManager object is initialized.
+  VirtualKeyboardManager::GetInstance();
+#endif

[sadrul, 2011/10/03 18:09:18]

Quick nit: Please remove the keyboard initialization from
ui/touch/frame/touch_browser_frame_view.cc since it would already be initialized
here.

[hashimoto, 2011/10/04 01:02:26]

Done.

 }
 
 OpaqueBrowserFrameView::~OpaqueBrowserFrameView() {