OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/root_window_controller.h" | 5 #include "ash/root_window_controller.h" |
6 | 6 |
7 #include <queue> | 7 #include <queue> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_constants.h" | 10 #include "ash/ash_constants.h" |
(...skipping 617 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
628 keyboard_controller->AddObserver(workspace_controller_->layout_manager()); | 628 keyboard_controller->AddObserver(workspace_controller_->layout_manager()); |
629 keyboard_controller->AddObserver( | 629 keyboard_controller->AddObserver( |
630 always_on_top_controller_->GetLayoutManager()); | 630 always_on_top_controller_->GetLayoutManager()); |
631 Shell::GetInstance()->delegate()->VirtualKeyboardActivated(true); | 631 Shell::GetInstance()->delegate()->VirtualKeyboardActivated(true); |
632 aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer); | 632 aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer); |
633 DCHECK(parent); | 633 DCHECK(parent); |
634 aura::Window* keyboard_container = | 634 aura::Window* keyboard_container = |
635 keyboard_controller->GetContainerWindow(); | 635 keyboard_controller->GetContainerWindow(); |
636 keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer); | 636 keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer); |
637 parent->AddChild(keyboard_container); | 637 parent->AddChild(keyboard_container); |
638 // TODO(oshima): Bounds of keyboard container should be handled by | |
639 // RootWindowLayoutManager. Remove this after fixed RootWindowLayoutManager. | |
640 keyboard_container->SetBounds(parent->bounds()); | |
641 } | 638 } |
642 | 639 |
643 void RootWindowController::DeactivateKeyboard( | 640 void RootWindowController::DeactivateKeyboard( |
644 keyboard::KeyboardController* keyboard_controller) { | 641 keyboard::KeyboardController* keyboard_controller) { |
645 if (!keyboard_controller || | 642 if (!keyboard_controller || |
646 !keyboard_controller->keyboard_container_initialized()) { | 643 !keyboard_controller->keyboard_container_initialized()) { |
647 return; | 644 return; |
648 } | 645 } |
649 aura::Window* keyboard_container = | 646 aura::Window* keyboard_container = |
650 keyboard_controller->GetContainerWindow(); | 647 keyboard_controller->GetContainerWindow(); |
(...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1055 else | 1052 else |
1056 DisableTouchHudProjection(); | 1053 DisableTouchHudProjection(); |
1057 } | 1054 } |
1058 | 1055 |
1059 RootWindowController* GetRootWindowController( | 1056 RootWindowController* GetRootWindowController( |
1060 const aura::Window* root_window) { | 1057 const aura::Window* root_window) { |
1061 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1058 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
1062 } | 1059 } |
1063 | 1060 |
1064 } // namespace ash | 1061 } // namespace ash |
OLD | NEW |