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

Unified Diff: ash/shell.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/display/mirror_window_controller.cc ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index 4ed2409759d684dd74f3753156d207ccf41a2bb1..66417d344e5c331923b82e065a882be2a23c9ffd 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -652,6 +652,8 @@ void Shell::Init(const ShellInitParams& init_params) {
display_manager_->RefreshFontParams();
aura::Env::GetInstance()->set_context_factory(init_params.context_factory);
+ aura::Env::GetInstance()->set_context_factory_private(
+ init_params.context_factory_private);
// The WindowModalityController needs to be at the front of the input event
// pretarget handler list to ensure that it processes input events when modal
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/shell/content/client/shell_browser_main_parts.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698