Add the virtual keyboard to BrowserFrameChromeos.

chrome/browser/chromeos/frame/browser_frame_chromeos.cc

Index: chrome/browser/chromeos/frame/browser_frame_chromeos.cc
diff --git a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
index e56126ceacd2a0f27a482fce3a9a0ce8efb513b2..37ae3b0be378506f1b0abea9d0eb81c5cbf03361 100644
--- a/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
+++ b/chrome/browser/chromeos/frame/browser_frame_chromeos.cc
@@ -5,9 +5,12 @@
 #include "chrome/browser/chromeos/frame/browser_frame_chromeos.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/browser/views/frame/opaque_browser_frame_view.h"
-#include "chrome/browser/views/frame/popup_non_client_frame_view.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
+#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h"
+#if defined(TOUCH_UI)

[sky, 2010/12/09 22:19:03]

conditional includes should be grouped after non-conditional includes.

[bryeung, 2010/12/10 17:23:19]

Done.

+#include "chrome/browser/ui/views/frame/touch_browser_frame_view.h"
+#endif
 #include "chrome/common/chrome_switches.h"
 
 // static (Factory method.)
@@ -38,7 +41,11 @@ void BrowserFrameChromeos::Init() {
     set_browser_frame_view(new PopupNonClientFrameView());
   } else {
     // Default FrameView.
+#if defined(TOUCH_UI)

[sky, 2010/12/09 22:19:03]

Add a factory method/function some where so that you don't need the ifdef here.

[bryeung, 2010/12/10 17:23:19]

Done.

+    set_browser_frame_view(new TouchBrowserFrameView(this, browser_view()));
+#else
     set_browser_frame_view(new OpaqueBrowserFrameView(this, browser_view()));
+#endif
   }
 
   BrowserFrameGtk::Init();