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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate (Closed)
Patch Set: Restore mash Created 4 years 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 | « components/exo/surface_unittest.cc ('k') | content/browser/compositor/gpu_process_transport_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 601fcd633fee257f5f2c77239d93ed688ee05d4a..ff0c374311c2279ce078822c87247e861508fd50 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -1381,6 +1381,8 @@ int BrowserMainLoop::BrowserThreadsStarted() {
switches::kUseMusInRenderer);
if (aura::Env::GetInstance() && !use_mus_in_renderer) {
aura::Env::GetInstance()->set_context_factory(GetContextFactory());
+ aura::Env::GetInstance()->set_context_factory_private(
+ GetContextFactoryPrivate());
}
#endif // defined(USE_AURA)
#endif // defined(OS_ANDROID)
« no previous file with comments | « components/exo/surface_unittest.cc ('k') | content/browser/compositor/gpu_process_transport_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698