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

Unified Diff: content/browser/browser_main_loop.cc

Issue 2563783002: ui + mus: Split ContextFactory into ContextFactory(Client) and ContextFactoryPrivate (Closed)
Patch Set: Fix some Mac tests 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
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 19e5674f99afb148e52da40c097139ace7bfc3ca..1b39c77cca3785fc27103c052eb30c038d1e6417 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)

Powered by Google App Engine
This is Rietveld 408576698