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

Side by Side Diff: ash/root_window_controller.cc

Issue 25740005: Observe keyboard notifications in docked layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 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
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_layout_manager.cc » ('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 <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 if (keyboard::IsKeyboardEnabled()) { 532 if (keyboard::IsKeyboardEnabled()) {
533 aura::Window* parent = root_window(); 533 aura::Window* parent = root_window();
534 534
535 keyboard::KeyboardControllerProxy* proxy = 535 keyboard::KeyboardControllerProxy* proxy =
536 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy(); 536 Shell::GetInstance()->delegate()->CreateKeyboardControllerProxy();
537 keyboard_controller_.reset( 537 keyboard_controller_.reset(
538 new keyboard::KeyboardController(proxy)); 538 new keyboard::KeyboardController(proxy));
539 539
540 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager()); 540 keyboard_controller_->AddObserver(shelf()->shelf_layout_manager());
541 keyboard_controller_->AddObserver(panel_layout_manager_); 541 keyboard_controller_->AddObserver(panel_layout_manager_);
542 keyboard_controller_->AddObserver(docked_layout_manager_);
542 543
543 // Deletes the old container since |keyboard_controller_| creates a 544 // Deletes the old container since |keyboard_controller_| creates a
544 // new container window in GetContainerWindow(). 545 // new container window in GetContainerWindow().
545 delete GetContainer(kShellWindowId_VirtualKeyboardContainer); 546 delete GetContainer(kShellWindowId_VirtualKeyboardContainer);
546 547
547 aura::Window* keyboard_container = 548 aura::Window* keyboard_container =
548 keyboard_controller_->GetContainerWindow(); 549 keyboard_controller_->GetContainerWindow();
549 keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer); 550 keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer);
550 parent->AddChild(keyboard_container); 551 parent->AddChild(keyboard_container);
551 keyboard_container->SetBounds(parent->bounds()); 552 keyboard_container->SetBounds(parent->bounds());
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 DisableTouchHudProjection(); 838 DisableTouchHudProjection();
838 } 839 }
839 840
840 RootWindowController* GetRootWindowController( 841 RootWindowController* GetRootWindowController(
841 const aura::RootWindow* root_window) { 842 const aura::RootWindow* root_window) {
842 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 843 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
843 } 844 }
844 845
845 } // namespace internal 846 } // namespace internal
846 } // namespace ash 847 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/wm/dock/docked_window_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698