| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/display/virtual_keyboard_window_controller.h" | 5 #include "ash/display/virtual_keyboard_window_controller.h" |
| 6 | 6 |
| 7 #include "ash/display/display_controller.h" | 7 #include "ash/display/display_controller.h" |
| 8 #include "ash/display/display_info.h" | 8 #include "ash/display/display_info.h" |
| 9 #include "ash/display/display_manager.h" | 9 #include "ash/display/display_manager.h" |
| 10 #include "ash/display/root_window_transformers.h" | 10 #include "ash/display/root_window_transformers.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 root_window_controller_.reset(GetRootWindowController( | 61 root_window_controller_.reset(GetRootWindowController( |
| 62 root_window->window())); | 62 root_window->window())); |
| 63 root_window_controller_->dispatcher()->host()->Show(); | 63 root_window_controller_->dispatcher()->host()->Show(); |
| 64 root_window_controller_->ActivateKeyboard( | 64 root_window_controller_->ActivateKeyboard( |
| 65 Shell::GetInstance()->keyboard_controller()); | 65 Shell::GetInstance()->keyboard_controller()); |
| 66 FlipDisplay(); | 66 FlipDisplay(); |
| 67 } else { | 67 } else { |
| 68 aura::RootWindow* root_window = root_window_controller_->dispatcher(); | 68 aura::RootWindow* root_window = root_window_controller_->dispatcher(); |
| 69 GetRootWindowSettings(root_window->window())->display_id = | 69 GetRootWindowSettings(root_window->window())->display_id = |
| 70 display_info.id(); | 70 display_info.id(); |
| 71 root_window->host()->SetBounds(display_info.bounds_in_native()); | 71 root_window->SetHostBounds(display_info.bounds_in_native()); |
| 72 } | 72 } |
| 73 } | 73 } |
| 74 | 74 |
| 75 void VirtualKeyboardWindowController::Close() { | 75 void VirtualKeyboardWindowController::Close() { |
| 76 if (root_window_controller_.get()) { | 76 if (root_window_controller_.get()) { |
| 77 root_window_controller_->dispatcher()->RemoveRootWindowObserver( | 77 root_window_controller_->dispatcher()->RemoveRootWindowObserver( |
| 78 Shell::GetInstance()->display_controller()); | 78 Shell::GetInstance()->display_controller()); |
| 79 root_window_controller_->Shutdown(); | 79 root_window_controller_->Shutdown(); |
| 80 root_window_controller_.reset(); | 80 root_window_controller_.reset(); |
| 81 } | 81 } |
| (...skipping 11 matching lines...) Expand all Loading... |
| 93 | 93 |
| 94 aura::RootWindow* root_window = root_window_controller_->dispatcher(); | 94 aura::RootWindow* root_window = root_window_controller_->dispatcher(); |
| 95 scoped_ptr<aura::RootWindowTransformer> transformer( | 95 scoped_ptr<aura::RootWindowTransformer> transformer( |
| 96 internal::CreateRootWindowTransformerForDisplay(root_window->window(), | 96 internal::CreateRootWindowTransformerForDisplay(root_window->window(), |
| 97 display_manager->non_desktop_display())); | 97 display_manager->non_desktop_display())); |
| 98 root_window->host()->SetRootWindowTransformer(transformer.Pass()); | 98 root_window->host()->SetRootWindowTransformer(transformer.Pass()); |
| 99 } | 99 } |
| 100 | 100 |
| 101 } // namespace internal | 101 } // namespace internal |
| 102 } // namespace ash | 102 } // namespace ash |
| OLD | NEW |