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

Unified Diff: mojo/aura/window_tree_host_mojo.cc

Issue 306123007: Removes usage of Compositor/ContextFactory methods (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/window_tree_host_mojo.cc
diff --git a/mojo/aura/window_tree_host_mojo.cc b/mojo/aura/window_tree_host_mojo.cc
index f3e42d1931c22294756c756520934f2e15bae0e3..e944fdbb22d8092179607a850b1df2d78d27d739 100644
--- a/mojo/aura/window_tree_host_mojo.cc
+++ b/mojo/aura/window_tree_host_mojo.cc
@@ -40,12 +40,10 @@ WindowTreeHostMojo::WindowTreeHostMojo(
// The ContextFactory must exist before any Compositors are created.
if (context_factory_) {
- ui::ContextFactory::SetInstance(NULL);
delete context_factory_;
context_factory_ = NULL;
}
context_factory_ = new ContextFactoryMojo(pipe.handle1.Pass());
- ui::ContextFactory::SetInstance(context_factory_);
aura::Env::GetInstance()->set_context_factory(context_factory_);
CHECK(context_factory_) << "No GL bindings.";
}
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698