aura: Move the keyboard correctly in the proper container.

aura: Move the keyboard correctly in the proper container.

BUG=none
TEST=manually

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106861

[Ben Goodger (Google), 2011-10-22 20:38:05]

LGTM

On Sat, Oct 22, 2011 at 1:21 PM, <sadrul@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> aura: Move the keyboard correctly in the proper container.
>
> BUG=none
> TEST=manually
>
>
> Please review this at
http://codereview.chromium.**org/8375018/<http://codereview.chromium.org/8375...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/browser/ui/views/dom_**view.cc
>  M chrome/browser/ui/virtual_**keyboard/virtual_keyboard_**manager.cc
>
>
> Index: chrome/browser/ui/views/dom_**view.cc
> diff --git a/chrome/browser/ui/views/dom_**view.cc
> b/chrome/browser/ui/views/dom_**view.cc
> index 762793813761d8ca440cd60fff6021**996e5537ae..**
> 64ce7390c748e33c73d2c7afd02234**5febf9de07 100644
> --- a/chrome/browser/ui/views/dom_**view.cc
> +++ b/chrome/browser/ui/views/dom_**view.cc
> @@ -80,7 +80,7 @@ void DOMView::ViewHierarchyChanged(**bool is_add,
> views::View* parent,
>  }
>
>  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());
> @@ -90,7 +90,7 @@ void DOMView::AttachTabContents() {
>   } else {
>  #endif
>     Attach(dom_contents_->tab_**contents()->GetNativeView());
> -#if !defined(USE_AURA)
> +#if defined(TOUCH_UI) || !defined(USE_AURA)
>   }
>  #endif
>  }
> Index: chrome/browser/ui/virtual_**keyboard/virtual_keyboard_**manager.cc
> diff --git
a/chrome/browser/ui/virtual_**keyboard/virtual_keyboard_**manager.cc
> b/chrome/browser/ui/virtual_**keyboard/virtual_keyboard_**manager.cc
> index e69f2b8f6c0ff36eafb72abd789215**34963f39d4..**
> 2844e6b22b183f794fe9c68e98690c**ddc6663f03 100644
> --- a/chrome/browser/ui/virtual_**keyboard/virtual_keyboard_**manager.cc
> +++ b/chrome/browser/ui/virtual_**keyboard/virtual_keyboard_**manager.cc
> @@ -184,11 +184,12 @@ KeyboardWidget::**KeyboardWidget()
>   params.keep_on_top = true;
>   params.transparent = true;
>   params.bounds = GetKeyboardPosition(keyboard_**height_);
> +  Init(params);
>  #if defined(USE_AURA)
> -  params.parent = aura_shell::Shell::**GetInstance()->GetContainer(
> -      aura_shell::internal::**kShellWindowId_**
> MenusAndTooltipsContainer);
> +  aura_shell::Shell::**GetInstance()->GetContainer(
> +      aura_shell::internal::**kShellWindowId_**
> MenusAndTooltipsContainer)->
> +      AddChild(GetNativeView());
>  #endif
> -  Init(params);
>
>   // Setup the DOM view to host the keyboard.
>   Profile* profile = ProfileManager::**GetDefaultProfile();
>
>
>