Add the virtual keyboard to BrowserFrameChromeos.

chrome/browser/chromeos/frame/browser_frame_chromeos.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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.)
 BrowserFrame* BrowserFrame::Create(BrowserView* browser_view,
                                    Profile* profile) {
   chromeos::BrowserFrameChromeos* frame =
       new chromeos::BrowserFrameChromeos(browser_view, profile);
   frame->Init();
   return frame;
 }
@@ skipping 10 matching lines @@
 
 void BrowserFrameChromeos::Init() {
   // NOTE: This logic supersedes the logic in BrowserFrameGtk::Init()
   // by always setting browser_frame_view_.
   bool is_popup = browser_view()->IsBrowserTypePopup();
   if (is_popup) {
     // ChromeOS Panels should always use PopupNonClientFrameView.
     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();
 
   if (!is_popup) {
     // On chromeos we want windows to always render as active.
     GetNonClientView()->DisableInactiveRendering(true);
   }
 }
 
 bool BrowserFrameChromeos::IsMaximized() const {
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeosFrame))
     return WindowGtk::IsMaximized();
   bool is_popup = browser_view()->IsBrowserTypePopup();
   return !IsFullscreen() && (!is_popup || WindowGtk::IsMaximized());
 }
 
 }  // namespace chromeos