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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
480 keyboard::KeyboardControllerProxy* proxy = | 480 keyboard::KeyboardControllerProxy* proxy = |
481 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); | 481 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); |
482 keyboard_controller_.reset( | 482 keyboard_controller_.reset( |
483 new keyboard::KeyboardController(proxy)); | 483 new keyboard::KeyboardController(proxy)); |
484 | 484 |
485 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); | 485 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); |
486 keyboard_controller_->AddObserver(panel_layout_manager_); | 486 keyboard_controller_->AddObserver(panel_layout_manager_); |
487 | 487 |
488 aura::Window* keyboard_container = | 488 aura::Window* keyboard_container = |
489 keyboard_controller_->GetContainerWindow(); | 489 keyboard_controller_->GetContainerWindow(); |
| 490 keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer); |
490 parent->AddChild(keyboard_container); | 491 parent->AddChild(keyboard_container); |
491 keyboard_container->SetBounds(parent->bounds()); | 492 keyboard_container->SetBounds(parent->bounds()); |
492 } | 493 } |
493 } | 494 } |
494 | 495 |
495 | 496 |
496 //////////////////////////////////////////////////////////////////////////////// | 497 //////////////////////////////////////////////////////////////////////////////// |
497 // RootWindowController, private: | 498 // RootWindowController, private: |
498 | 499 |
499 void RootWindowController::InitLayoutManagers() { | 500 void RootWindowController::InitLayoutManagers() { |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
769 | 770 |
770 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) { | 771 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) { |
771 if (enabled) | 772 if (enabled) |
772 EnableTouchHudProjection(); | 773 EnableTouchHudProjection(); |
773 else | 774 else |
774 DisableTouchHudProjection(); | 775 DisableTouchHudProjection(); |
775 } | 776 } |
776 | 777 |
777 } // namespace internal | 778 } // namespace internal |
778 } // namespace ash | 779 } // namespace ash |
OLD | NEW |