aura: Move the keyboard correctly in the proper container.

chrome/browser/ui/views/dom_view.cc

 // Copyright (c) 2011 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/ui/views/dom_view.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 62 matching lines @@
   // Attach the native_view when this is added to Widget if
   // the native view has not been attached yet and tab_contents_ exists.
   views::NativeViewHost::ViewHierarchyChanged(is_add, parent, child);
   if (is_add && GetWidget() && !native_view() && dom_contents_.get())
     AttachTabContents();
   else if (!is_add && child == this && native_view())
     Detach();
 }
 
 void DOMView::AttachTabContents() {
-#if !defined(USE_AURA)
+#if defined(TOUCH_UI) || !defined(USE_AURA)
   if (views::Widget::IsPureViews()) {
     TabContentsViewViews* widget = static_cast<TabContentsViewViews*>(
         dom_contents_->tab_contents()->view());
     views::NativeWidgetViews* nwv =
         static_cast<views::NativeWidgetViews*>(widget->native_widget());
     AttachToView(nwv->GetView());
   } else {
 #endif
     Attach(dom_contents_->tab_contents()->GetNativeView());
-#if !defined(USE_AURA)
+#if defined(TOUCH_UI) || !defined(USE_AURA)
   }
 #endif
 }