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

Side by Side Diff: ash/root_window_controller.cc

Issue 14477010: Partial fix for keyboard occlusion. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gyp fix Created 7 years, 7 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
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 } 456 }
457 457
458 void RootWindowController::InitKeyboard() { 458 void RootWindowController::InitKeyboard() {
459 if (keyboard::IsKeyboardEnabled()) { 459 if (keyboard::IsKeyboardEnabled()) {
460 aura::Window* parent = root_window(); 460 aura::Window* parent = root_window();
461 461
462 keyboard::KeyboardControllerProxy* proxy = 462 keyboard::KeyboardControllerProxy* proxy =
463 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); 463 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
464 keyboard_controller_.reset( 464 keyboard_controller_.reset(
465 new keyboard::KeyboardController(proxy)); 465 new keyboard::KeyboardController(proxy));
466
467 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
468 keyboard_controller_->AddObserver(panel_layout_manager_);
469
466 aura::Window* keyboard_container = 470 aura::Window* keyboard_container =
467 keyboard_controller_->GetContainerWindow(); 471 keyboard_controller_->GetContainerWindow();
468 parent->AddChild(keyboard_container); 472 parent->AddChild(keyboard_container);
469 keyboard_container->SetBounds(parent->bounds()); 473 keyboard_container->SetBounds(parent->bounds());
470 } 474 }
471 } 475 }
472 476
473 477
474 //////////////////////////////////////////////////////////////////////////////// 478 ////////////////////////////////////////////////////////////////////////////////
475 // RootWindowController, private: 479 // RootWindowController, private:
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 "OverlayContainer", 629 "OverlayContainer",
626 lock_screen_related_containers); 630 lock_screen_related_containers);
627 SetUsesScreenCoordinates(overlay_container); 631 SetUsesScreenCoordinates(overlay_container);
628 632
629 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 633 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
630 "PowerButtonAnimationContainer", root_window) ; 634 "PowerButtonAnimationContainer", root_window) ;
631 } 635 }
632 636
633 } // namespace internal 637 } // namespace internal
634 } // namespace ash 638 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/shelf/shelf_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698