Merge pull request #493 from brave/browser-laptop/13090

ensure that `session-created` fires for the main browser context
brave · Feb 12, 2018 · 9453d96 · 9453d96
2 parents 1b37cd7 + ab4fa98
commit 9453d96
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/atom/browser/atom_browser_main_parts.cc b/atom/browser/atom_browser_main_parts.cc
@@ -328,9 +328,6 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
   OSCrypt::SetConfig(std::move(config));
 #endif
 
-  browser_context_ = ProfileManager::GetActiveUserProfile();
-  brightray::BrowserMainParts::PreMainMessageLoopRun();
-
   js_env_.reset(new JavascriptEnvironment);
   js_env_->isolate()->Enter();
 
@@ -359,6 +356,9 @@ void AtomBrowserMainParts::PreMainMessageLoopRun() {
   node_bindings_->PrepareMessageLoop();
   node_bindings_->RunMessageLoop();
 
+  browser_context_ = ProfileManager::GetActiveUserProfile();
+  brightray::BrowserMainParts::PreMainMessageLoopRun();
+
 #if defined(USE_X11)
   libgtkui::GtkInitFromCommandLine(*base::CommandLine::ForCurrentProcess());
 #endif