| Index: ash/display/virtual_keyboard_window_controller.cc
|
| diff --git a/ash/display/virtual_keyboard_window_controller.cc b/ash/display/virtual_keyboard_window_controller.cc
|
| index 531aa9bc205a41cd58ae524a0f967f2ecbcdf30e..b7cb2621b9d56165ebe3d8b1ce4197283a48a2dd 100644
|
| --- a/ash/display/virtual_keyboard_window_controller.cc
|
| +++ b/ash/display/virtual_keyboard_window_controller.cc
|
| @@ -22,7 +22,6 @@
|
| #include "ui/keyboard/keyboard_util.h"
|
|
|
| namespace ash {
|
| -namespace internal {
|
|
|
| VirtualKeyboardWindowController::VirtualKeyboardWindowController() {
|
| Shell::GetInstance()->AddShellObserver(this);
|
| @@ -90,8 +89,8 @@ void VirtualKeyboardWindowController::FlipDisplay() {
|
|
|
| aura::WindowTreeHost* host = root_window_controller_->host();
|
| scoped_ptr<aura::RootWindowTransformer> transformer(
|
| - internal::CreateRootWindowTransformerForDisplay(host->window(),
|
| - display_manager->non_desktop_display()));
|
| + CreateRootWindowTransformerForDisplay(
|
| + host->window(), display_manager->non_desktop_display()));
|
| host->SetRootWindowTransformer(transformer.Pass());
|
| }
|
|
|
| @@ -106,5 +105,4 @@ void VirtualKeyboardWindowController::OnMaximizeModeEnded() {
|
| Shell::GetInstance()->DeactivateKeyboard();
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|