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

Unified Diff: content/browser/compositor/image_transport_factory.cc

Issue 307963007: Removes ContextFactory::Get/SetInstance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix aura_bench 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 | « no previous file | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/image_transport_factory.cc
diff --git a/content/browser/compositor/image_transport_factory.cc b/content/browser/compositor/image_transport_factory.cc
index 0827acb7b89dd029a4842338b61fc41f55256977..66d484f51eb51bfc39629fe3201d2c6aec0195b5 100644
--- a/content/browser/compositor/image_transport_factory.cc
+++ b/content/browser/compositor/image_transport_factory.cc
@@ -20,7 +20,6 @@ static gfx::DisableNullDrawGLBindings* g_disable_null_draw = NULL;
void SetFactory(ImageTransportFactory* factory) {
g_factory = factory;
- ui::ContextFactory::SetInstance(factory->GetContextFactory());
}
}
@@ -48,7 +47,6 @@ void ImageTransportFactory::InitializeForUnitTests(
// static
void ImageTransportFactory::Terminate() {
- ui::ContextFactory::SetInstance(NULL);
delete g_factory;
g_factory = NULL;
delete g_disable_null_draw;
« no previous file with comments | « no previous file | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698