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

Unified Diff: ash/display/mirror_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/mirror_window_controller.h ('k') | ash/display/virtual_keyboard_window_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mirror_window_controller.cc
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 32d92294a43c7d3a7d7ab3e30ee1d58412ed0413..89e4213abbc162034b8c19fd001ae5c0524d6843 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -72,7 +72,9 @@ class NoneCaptureClient : public aura::client::CaptureClient {
} // namespace
-MirrorWindowController::MirrorWindowController() {}
+MirrorWindowController::MirrorWindowController(
+ ui::ContextFactory* context_factory)
+ : context_factory_(context_factory) {}
MirrorWindowController::~MirrorWindowController() {
// Make sure the root window gets deleted before cursor_window_delegate.
@@ -84,6 +86,7 @@ void MirrorWindowController::UpdateWindow(const DisplayInfo& display_info) {
if (!ash_host_.get()) {
AshWindowTreeHostInitParams init_params;
init_params.initial_bounds = display_info.bounds_in_native();
+ init_params.context_factory = context_factory_;
ash_host_.reset(AshWindowTreeHost::Create(init_params));
aura::WindowTreeHost* host = ash_host_->AsWindowTreeHost();
host->window()->SetName(
« no previous file with comments | « ash/display/mirror_window_controller.h ('k') | ash/display/virtual_keyboard_window_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698