| 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 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 470 } | 470 } |
| 471 | 471 |
| 472 void RootWindowController::InitKeyboard() { | 472 void RootWindowController::InitKeyboard() { |
| 473 if (keyboard::IsKeyboardEnabled()) { | 473 if (keyboard::IsKeyboardEnabled()) { |
| 474 aura::Window* parent = root_window(); | 474 aura::Window* parent = root_window(); |
| 475 | 475 |
| 476 keyboard::KeyboardControllerProxy* proxy = | 476 keyboard::KeyboardControllerProxy* proxy = |
| 477 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); | 477 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); |
| 478 keyboard_controller_.reset( | 478 keyboard_controller_.reset( |
| 479 new keyboard::KeyboardController(proxy)); | 479 new keyboard::KeyboardController(proxy)); |
| 480 |
| 481 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); |
| 482 keyboard_controller_->AddObserver(panel_layout_manager_); |
| 483 |
| 480 aura::Window* keyboard_container = | 484 aura::Window* keyboard_container = |
| 481 keyboard_controller_->GetContainerWindow(); | 485 keyboard_controller_->GetContainerWindow(); |
| 486 |
| 482 parent->AddChild(keyboard_container); | 487 parent->AddChild(keyboard_container); |
| 483 keyboard_container->SetBounds(parent->bounds()); | 488 keyboard_container->SetBounds(parent->bounds()); |
| 484 } | 489 } |
| 485 } | 490 } |
| 486 | 491 |
| 487 | 492 |
| 488 //////////////////////////////////////////////////////////////////////////////// | 493 //////////////////////////////////////////////////////////////////////////////// |
| 489 // RootWindowController, private: | 494 // RootWindowController, private: |
| 490 | 495 |
| 491 void RootWindowController::CreateContainersInRootWindow( | 496 void RootWindowController::CreateContainersInRootWindow( |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 "OverlayContainer", | 644 "OverlayContainer", |
| 640 lock_screen_related_containers); | 645 lock_screen_related_containers); |
| 641 SetUsesScreenCoordinates(overlay_container); | 646 SetUsesScreenCoordinates(overlay_container); |
| 642 | 647 |
| 643 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, | 648 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, |
| 644 "PowerButtonAnimationContainer", root_window) ; | 649 "PowerButtonAnimationContainer", root_window) ; |
| 645 } | 650 } |
| 646 | 651 |
| 647 } // namespace internal | 652 } // namespace internal |
| 648 } // namespace ash | 653 } // namespace ash |
| OLD | NEW |