Chromium Code Reviews| Index: ash/wm/workspace/workspace_layout_manager.cc |
| diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc |
| index 68fabb50f7cb58a4557ec0cd316eb7dc9184e65d..367637cc168f409cae754f4d093079adfcb18393 100644 |
| --- a/ash/wm/workspace/workspace_layout_manager.cc |
| +++ b/ash/wm/workspace/workspace_layout_manager.cc |
| @@ -134,17 +134,16 @@ void WorkspaceLayoutManager::SetChildBounds( |
| 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* toplevel_window_state = wm::GetWindowState(window); |
|
flackr
2014/08/25 14:26:06
nit: s/toplevel_window_state/window_state
Since it
rsadam
2014/08/25 15:10:52
Done.
|
| if (!new_bounds.IsEmpty()) { |
| // Store existing bounds to be restored before resizing for keyboard if it |
| // is not already stored. |