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

Unified Diff: chrome/browser/ui/ash/ash_init.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 | « ash/test/ash_test_helper.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index e64b95b332faae2d2e0a0a872486115800bbeb35..be79194eeb825ab2360de68c4c660876cad88a07 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -62,6 +62,8 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
// Shell takes ownership of ChromeShellDelegate.
shell_init_params.delegate = new ChromeShellDelegate;
shell_init_params.context_factory = content::GetContextFactory();
+ shell_init_params.context_factory_private =
+ content::GetContextFactoryPrivate();
shell_init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);
« no previous file with comments | « ash/test/ash_test_helper.cc ('k') | chrome/browser/ui/views/chrome_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698