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 <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/ash_constants.h" | 9 #include "ash/ash_constants.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 if (keyboard::IsKeyboardEnabled()) { | 504 if (keyboard::IsKeyboardEnabled()) { |
505 aura::Window* parent = root_window(); | 505 aura::Window* parent = root_window(); |
506 | 506 |
507 keyboard::KeyboardControllerProxy* proxy = | 507 keyboard::KeyboardControllerProxy* proxy = |
508 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); | 508 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); |
509 keyboard_controller_.reset( | 509 keyboard_controller_.reset( |
510 new keyboard::KeyboardController(proxy)); | 510 new keyboard::KeyboardController(proxy)); |
511 aura::Window* keyboard_container = | 511 aura::Window* keyboard_container = |
512 keyboard_controller_->GetContainerWindow(); | 512 keyboard_controller_->GetContainerWindow(); |
513 parent->AddChild(keyboard_container); | 513 parent->AddChild(keyboard_container); |
| 514 keyboard_container->SetBounds(parent->bounds()); |
514 } | 515 } |
515 } | 516 } |
516 | 517 |
517 | 518 |
518 //////////////////////////////////////////////////////////////////////////////// | 519 //////////////////////////////////////////////////////////////////////////////// |
519 // RootWindowController, private: | 520 // RootWindowController, private: |
520 | 521 |
521 void RootWindowController::CreateContainersInRootWindow( | 522 void RootWindowController::CreateContainersInRootWindow( |
522 aura::RootWindow* root_window) { | 523 aura::RootWindow* root_window) { |
523 // These containers are just used by PowerButtonController to animate groups | 524 // These containers are just used by PowerButtonController to animate groups |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
669 "OverlayContainer", | 670 "OverlayContainer", |
670 lock_screen_related_containers); | 671 lock_screen_related_containers); |
671 SetUsesScreenCoordinates(overlay_container); | 672 SetUsesScreenCoordinates(overlay_container); |
672 | 673 |
673 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, | 674 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, |
674 "PowerButtonAnimationContainer", root_window) ; | 675 "PowerButtonAnimationContainer", root_window) ; |
675 } | 676 } |
676 | 677 |
677 } // namespace internal | 678 } // namespace internal |
678 } // namespace ash | 679 } // namespace ash |
OLD | NEW |