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

Unified Diff: extensions/shell/browser/shell_browser_main_parts.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 | « content/public/test/test_renderer_host.cc ('k') | mash/test/mash_test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/shell/browser/shell_browser_main_parts.cc
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index 8dff54e5908e71d1ba23accfabf8c2d4d3b1bcb6..de4c46dbb6a1e8a5f83a95247aecaf852f8dbb7a 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -155,6 +155,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
#if defined(USE_AURA)
aura::Env::GetInstance()->set_context_factory(content::GetContextFactory());
+ aura::Env::GetInstance()->set_context_factory_private(
+ content::GetContextFactoryPrivate());
#endif
storage_monitor::StorageMonitor::Create();
« no previous file with comments | « content/public/test/test_renderer_host.cc ('k') | mash/test/mash_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698