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

Unified Diff: ash/display/virtual_keyboard_window_controller.cc

Issue 201573015: Introdcue AshWindowTreeHost and move ash/chrome specific code in WTH to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/host/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 58597b3a1324cd94a2aa331e5562435f2d0336b5..1cec588a2022ae7007a34d13fa09152a69ed2a8d 100644
--- a/ash/display/virtual_keyboard_window_controller.cc
+++ b/ash/display/virtual_keyboard_window_controller.cc
@@ -8,7 +8,8 @@
#include "ash/display/display_info.h"
#include "ash/display/display_manager.h"
#include "ash/display/root_window_transformers.h"
-#include "ash/host/window_tree_host_factory.h"
+#include "ash/host/ash_window_tree_host.h"
+#include "ash/host/root_window_transformer.h"
#include "ash/root_window_controller.h"
#include "ash/root_window_settings.h"
#include "ash/shell.h"
@@ -16,7 +17,6 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/aura/env.h"
-#include "ui/aura/root_window_transformer.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/keyboard/keyboard_controller.h"
#include "ui/keyboard/keyboard_util.h"
@@ -43,26 +43,25 @@ void VirtualKeyboardWindowController::UpdateWindow(
static int virtual_keyboard_host_count = 0;
if (!root_window_controller_.get()) {
const gfx::Rect& bounds_in_native = display_info.bounds_in_native();
- aura::WindowTreeHost* host =
- Shell::GetInstance()->window_tree_host_factory()->CreateWindowTreeHost(
- bounds_in_native);
- host->window()->SetName(
- base::StringPrintf("VirtualKeyboardRootWindow-%d",
- virtual_keyboard_host_count++));
+ AshWindowTreeHost* ash_host = AshWindowTreeHost::Create(bounds_in_native);
+ aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
+
+ host->window()->SetName(base::StringPrintf("VirtualKeyboardRootWindow-%d",
+ virtual_keyboard_host_count++));
// No need to remove WindowTreeHostObserver because the DisplayController
// outlives the host.
host->AddObserver(Shell::GetInstance()->display_controller());
InitRootWindowSettings(host->window())->display_id = display_info.id();
host->InitHost();
- RootWindowController::CreateForVirtualKeyboardDisplay(host);
+ RootWindowController::CreateForVirtualKeyboardDisplay(ash_host);
root_window_controller_.reset(GetRootWindowController(host->window()));
- root_window_controller_->host()->Show();
+ root_window_controller_->GetHost()->Show();
root_window_controller_->ActivateKeyboard(
keyboard::KeyboardController::GetInstance());
FlipDisplay();
} else {
- aura::WindowTreeHost* host = root_window_controller_->host();
+ aura::WindowTreeHost* host = root_window_controller_->GetHost();
GetRootWindowSettings(host->window())->display_id = display_info.id();
host->SetBounds(display_info.bounds_in_native());
}
@@ -70,7 +69,7 @@ void VirtualKeyboardWindowController::UpdateWindow(
void VirtualKeyboardWindowController::Close() {
if (root_window_controller_.get()) {
- root_window_controller_->host()->RemoveObserver(
+ root_window_controller_->GetHost()->RemoveObserver(
Shell::GetInstance()->display_controller());
root_window_controller_->Shutdown();
root_window_controller_.reset();
@@ -87,11 +86,12 @@ void VirtualKeyboardWindowController::FlipDisplay() {
display_manager->SetDisplayRotation(
display_manager->non_desktop_display().id(), gfx::Display::ROTATE_180);
- aura::WindowTreeHost* host = root_window_controller_->host();
- scoped_ptr<aura::RootWindowTransformer> transformer(
+ aura::WindowTreeHost* host = root_window_controller_->GetHost();
+ scoped_ptr<RootWindowTransformer> transformer(
CreateRootWindowTransformerForDisplay(
host->window(), display_manager->non_desktop_display()));
- host->SetRootWindowTransformer(transformer.Pass());
+ root_window_controller_->ash_host()->SetRootWindowTransformer(
+ transformer.Pass());
}
void VirtualKeyboardWindowController::OnMaximizeModeStarted() {
« no previous file with comments | « ash/display/root_window_transformers_unittest.cc ('k') | ash/host/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698