Resize BrowserFrameAsh and not RenderWidgetHostViewAura when keyboard bounds change.

ash/wm/workspace/workspace_layout_manager.cc

 // Copyright (c) 2012 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 "ash/wm/workspace/workspace_layout_manager.h"
 
 #include <algorithm>
 
 #include "ash/display/display_controller.h"
 #include "ash/root_window_controller.h"
@@ skipping 116 matching lines @@
   wm::SetBoundsEvent event(wm::WM_EVENT_SET_BOUNDS, requested_bounds);
   window_state->OnWMEvent(&event);
   UpdateShelfVisibility();
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, keyboard::KeyboardControllerObserver implementation:
 
 void WorkspaceLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& new_bounds) {
-  aura::Window* root_window = window_->GetRootWindow();
   ui::InputMethod* input_method =
-      root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
+      root_window_->GetProperty(aura::client::kRootWindowInputMethodKey);
   ui::TextInputClient* text_input_client = input_method->GetTextInputClient();
   if (!text_input_client)
     return;
-  aura::Window *window = text_input_client->GetAttachedWindow();
+  aura::Window *window =
+      text_input_client->GetAttachedWindow()->GetToplevelWindow();
   if (!window || !window_->Contains(window))
     return;
-  aura::Window *toplevel_window = window->GetToplevelWindow();
-  wm::WindowState* toplevel_window_state = wm::GetWindowState(toplevel_window);
+  wm::WindowState* window_state = wm::GetWindowState(window);
   if (!new_bounds.IsEmpty()) {
     // Store existing bounds to be restored before resizing for keyboard if it
     // is not already stored.
-    if (!toplevel_window_state->HasRestoreBounds())
-      toplevel_window_state->SaveCurrentBoundsForRestore();
+    if (!window_state->HasRestoreBounds())
+      window_state->SaveCurrentBoundsForRestore();
 
     gfx::Rect window_bounds = ScreenUtil::ConvertRectToScreen(
         window_,
         window->GetTargetBounds());
     gfx::Rect intersect = gfx::IntersectRects(window_bounds, new_bounds);
     int shift = std::min(intersect.height(),
                          window->bounds().y() - work_area_in_parent_.y());
     if (shift > 0) {
       gfx::Point origin(window->bounds().x(), window->bounds().y() - shift);
       SetChildBounds(window, gfx::Rect(origin, window->bounds().size()));
     }
-  } else if (toplevel_window_state->HasRestoreBounds()) {
+  } else if (window_state->HasRestoreBounds()) {
     // Keyboard hidden, restore original bounds if they exist.
-    toplevel_window_state->SetAndClearRestoreBounds();
+    window_state->SetAndClearRestoreBounds();
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // WorkspaceLayoutManager, ash::ShellObserver implementation:
 
 void WorkspaceLayoutManager::OnDisplayWorkAreaInsetsChanged() {
   const gfx::Rect work_area(ScreenUtil::ConvertRectFromScreen(
       window_,
       Shell::GetScreen()->GetDisplayNearestWindow(window_).work_area()));
@@ skipping 142 matching lines @@
   bool is_fullscreen = GetRootWindowController(
       window_->GetRootWindow())->GetWindowForFullscreenMode() != NULL;
   if (is_fullscreen != is_fullscreen_) {
     ash::Shell::GetInstance()->NotifyFullscreenStateChange(
         is_fullscreen, window_->GetRootWindow());
     is_fullscreen_ = is_fullscreen;
   }
 }
 
 }  // namespace ash