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

Side by Side Diff: ash/root_window_controller.cc

Issue 216743004: Prevent system modal dialog from blocking events to the virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move VK window test to root window controller. Created 6 years, 9 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 <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 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 // Virtual keyboard may be deactivated while still showing, notify all 645 // Virtual keyboard may be deactivated while still showing, notify all
646 // observers that keyboard bounds changed to 0 before remove them. 646 // observers that keyboard bounds changed to 0 before remove them.
647 keyboard_controller->NotifyKeyboardBoundsChanging(gfx::Rect()); 647 keyboard_controller->NotifyKeyboardBoundsChanging(gfx::Rect());
648 keyboard_controller->RemoveObserver(shelf()->shelf_layout_manager()); 648 keyboard_controller->RemoveObserver(shelf()->shelf_layout_manager());
649 keyboard_controller->RemoveObserver(panel_layout_manager_); 649 keyboard_controller->RemoveObserver(panel_layout_manager_);
650 keyboard_controller->RemoveObserver(docked_layout_manager_); 650 keyboard_controller->RemoveObserver(docked_layout_manager_);
651 } 651 }
652 } 652 }
653 } 653 }
654 654
655 bool RootWindowController::IsVirtualKeyboardWindow(aura::Window* window) {
656 aura::Window* parent = GetContainer(
657 kShellWindowId_VirtualKeyboardParentContainer);
658 return parent ? parent->Contains(window) : false;
659 }
660
655 //////////////////////////////////////////////////////////////////////////////// 661 ////////////////////////////////////////////////////////////////////////////////
656 // RootWindowController, private: 662 // RootWindowController, private:
657 663
658 RootWindowController::RootWindowController(aura::WindowTreeHost* host) 664 RootWindowController::RootWindowController(aura::WindowTreeHost* host)
659 : host_(host), 665 : host_(host),
660 root_window_layout_(NULL), 666 root_window_layout_(NULL),
661 docked_layout_manager_(NULL), 667 docked_layout_manager_(NULL),
662 panel_layout_manager_(NULL), 668 panel_layout_manager_(NULL),
663 touch_hud_debug_(NULL), 669 touch_hud_debug_(NULL),
664 touch_hud_projection_(NULL) { 670 touch_hud_projection_(NULL) {
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 DisableTouchHudProjection(); 1011 DisableTouchHudProjection();
1006 } 1012 }
1007 1013
1008 RootWindowController* GetRootWindowController( 1014 RootWindowController* GetRootWindowController(
1009 const aura::Window* root_window) { 1015 const aura::Window* root_window) {
1010 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; 1016 return root_window ? GetRootWindowSettings(root_window)->controller : NULL;
1011 } 1017 }
1012 1018
1013 } // namespace internal 1019 } // namespace internal
1014 } // namespace ash 1020 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698