Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(619)

Side by Side Diff: ash/root_window_controller.cc

Issue 22465007: Whitelist virtual keyboard container to process events at login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add unit tests for virtual keyboard container Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 keyboard::KeyboardControllerProxy* proxy = 445 keyboard::KeyboardControllerProxy* proxy =
446 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); 446 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
447 keyboard_controller_.reset( 447 keyboard_controller_.reset(
448 new keyboard::KeyboardController(proxy)); 448 new keyboard::KeyboardController(proxy));
449 449
450 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); 450 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
451 keyboard_controller_->AddObserver(panel_layout_manager_); 451 keyboard_controller_->AddObserver(panel_layout_manager_);
452 452
453 aura::Window* keyboard_container = 453 aura::Window* keyboard_container =
454 keyboard_controller_->GetContainerWindow(); 454 keyboard_controller_->GetContainerWindow();
455 keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
455 parent->AddChild(keyboard_container); 456 parent->AddChild(keyboard_container);
456 keyboard_container->SetBounds(parent->bounds()); 457 keyboard_container->SetBounds(parent->bounds());
457 } 458 }
458 } 459 }
459 460
460 461
461 //////////////////////////////////////////////////////////////////////////////// 462 ////////////////////////////////////////////////////////////////////////////////
462 // RootWindowController, private: 463 // RootWindowController, private:
463 464
464 void RootWindowController::InitLayoutManagers() { 465 void RootWindowController::InitLayoutManagers() {
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 722
722 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) { 723 void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
723 if (enabled) 724 if (enabled)
724 EnableTouchHudProjection(); 725 EnableTouchHudProjection();
725 else 726 else
726 DisableTouchHudProjection(); 727 DisableTouchHudProjection();
727 } 728 }
728 729
729 } // namespace internal 730 } // namespace internal
730 } // namespace ash 731 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698