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

Unified Diff: ash/display/virtual_keyboard_window_controller.cc

Issue 273073002: Changes code using Compositor to pass in ContextFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tooltip on chromeos Created 6 years, 7 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/virtual_keyboard_window_controller.h ('k') | ash/host/ash_remote_window_tree_host_win.h » ('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 b75854adba2ee3bf09a83247c466794c715f2312..38ef3e7d1fb85bfeae762dce90e206947d3fa06a 100644
--- a/ash/display/virtual_keyboard_window_controller.cc
+++ b/ash/display/virtual_keyboard_window_controller.cc
@@ -24,7 +24,9 @@
namespace ash {
-VirtualKeyboardWindowController::VirtualKeyboardWindowController() {
+VirtualKeyboardWindowController::VirtualKeyboardWindowController(
+ ui::ContextFactory* context_factory)
+ : context_factory_(context_factory) {
Shell::GetInstance()->AddShellObserver(this);
}
@@ -44,6 +46,7 @@ void VirtualKeyboardWindowController::UpdateWindow(
static int virtual_keyboard_host_count = 0;
if (!root_window_controller_.get()) {
AshWindowTreeHostInitParams init_params;
+ init_params.context_factory = context_factory_;
init_params.initial_bounds = display_info.bounds_in_native();
AshWindowTreeHost* ash_host = AshWindowTreeHost::Create(init_params);
aura::WindowTreeHost* host = ash_host->AsWindowTreeHost();
« no previous file with comments | « ash/display/virtual_keyboard_window_controller.h ('k') | ash/host/ash_remote_window_tree_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698