← Back to branch summary

~abreu-alexandre/oxide/location-provider-app-lifecycle

« back to all changes in this revision

Viewing changes to shared/browser/oxide_browser_process_main.cc

  • Committer: Chris Coulson
  • Date: 2015-01-16 20:00:13 UTC
  • Revision ID: chris.coulson@canonical.com-20150116200013-yzjt7h85hu6vhklo
https://launchpad.net/bugs/1411812
Ensure V8 snapshot is loaded in the browser process, so single-process mode works

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_browser_process_main.cc
52
52
#if defined(USE_NSS)
53
53
#include "crypto/nss_util.h"
54
54
#endif
 
55
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
 
56
#include "gin/public/isolate_holder.h"
 
57
#endif
55
58
#include "ipc/ipc_descriptors.h"
56
59
#include "ui/base/ui_base_paths.h"
57
60
#include "ui/base/ui_base_switches.h"
398
401
  content::RegisterContentSchemes(true);
399
402
 
400
403
  CHECK(base::i18n::InitializeICU()) << "Failed to initialize ICU";
 
404
#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
 
405
  CHECK(gin::IsolateHolder::LoadV8Snapshot());
 
406
#endif  // V8_USE_EXTERNAL_STARTUP_DATA
401
407
 
402
408
  main_delegate_->PreSandboxStartup();
403
409
  main_delegate_->SandboxInitialized(base::EmptyString());