Chromium Code Reviews| 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 <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 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 671 keyboard_controller->RemoveObserver(docked_layout_manager_); | 671 keyboard_controller->RemoveObserver(docked_layout_manager_); |
| 672 keyboard_controller->RemoveObserver( | 672 keyboard_controller->RemoveObserver( |
| 673 workspace_controller_->layout_manager()); | 673 workspace_controller_->layout_manager()); |
| 674 keyboard_controller->RemoveObserver( | 674 keyboard_controller->RemoveObserver( |
| 675 always_on_top_controller_->GetLayoutManager()); | 675 always_on_top_controller_->GetLayoutManager()); |
| 676 Shell::GetInstance()->delegate()->VirtualKeyboardActivated(false); | 676 Shell::GetInstance()->delegate()->VirtualKeyboardActivated(false); |
| 677 } | 677 } |
| 678 } | 678 } |
| 679 | 679 |
| 680 bool RootWindowController::IsVirtualKeyboardWindow(aura::Window* window) { | 680 bool RootWindowController::IsVirtualKeyboardWindow(aura::Window* window) { |
| 681 aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer); | 681 aura::Window* parent = GetContainer(kShellWindowId_VirtualKeyboardContainer); |
|
sadrul
2015/09/14 20:28:09
It's unclear to me if this can break existing code
bshe
2015/09/15 13:09:33
make sense. reverted it in this CL and will upload
| |
| 682 return parent ? parent->Contains(window) : false; | 682 return parent ? parent->Contains(window) : false; |
| 683 } | 683 } |
| 684 | 684 |
| 685 //////////////////////////////////////////////////////////////////////////////// | 685 //////////////////////////////////////////////////////////////////////////////// |
| 686 // RootWindowController, private: | 686 // RootWindowController, private: |
| 687 | 687 |
| 688 RootWindowController::RootWindowController(AshWindowTreeHost* ash_host) | 688 RootWindowController::RootWindowController(AshWindowTreeHost* ash_host) |
| 689 : ash_host_(ash_host), | 689 : ash_host_(ash_host), |
| 690 root_window_layout_(NULL), | 690 root_window_layout_(NULL), |
| 691 docked_layout_manager_(NULL), | 691 docked_layout_manager_(NULL), |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1059 else | 1059 else |
| 1060 DisableTouchHudProjection(); | 1060 DisableTouchHudProjection(); |
| 1061 } | 1061 } |
| 1062 | 1062 |
| 1063 RootWindowController* GetRootWindowController( | 1063 RootWindowController* GetRootWindowController( |
| 1064 const aura::Window* root_window) { | 1064 const aura::Window* root_window) { |
| 1065 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; | 1065 return root_window ? GetRootWindowSettings(root_window)->controller : NULL; |
| 1066 } | 1066 } |
| 1067 | 1067 |
| 1068 } // namespace ash | 1068 } // namespace ash |
| OLD | NEW |