← Back to branch summary

~justinmcp/oxide/mediahub-fullscreen

« back to all changes in this revision

Viewing changes to shared/browser/oxide_browser_process_main.cc

  • Committer: Chris Coulson
  • Date: 2015-04-24 00:27:16 UTC
  • mfrom: (640.1.248 canary)
  • Revision ID: chris.coulson@canonical.com-20150424002716-rz2vs6ts1vgi6uvr
Bump Chromium rev to 44.0.2376.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
shared/browser/oxide_browser_process_main.cc
47
47
#include "content/public/common/main_function_params.h"
48
48
#include "content/renderer/in_process_renderer_thread.h"
49
49
#include "content/utility/in_process_utility_thread.h"
50
 
#if defined(USE_NSS)
 
50
#if defined(USE_NSS_CERTS)
51
51
#include "crypto/nss_util.h"
52
52
#endif
53
53
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
98
98
  virtual ~BrowserProcessMainImpl();
99
99
 
100
100
  void Start(scoped_ptr<PlatformDelegate> delegate,
101
 
#if defined(USE_NSS)
 
101
#if defined(USE_NSS_CERTS)
102
102
             const base::FilePath& nss_db_path,
103
103
#endif
104
104
             gfx::GLImplementation gl_impl,
371
371
}
372
372
 
373
373
void BrowserProcessMainImpl::Start(scoped_ptr<PlatformDelegate> delegate,
374
 
#if defined(USE_NSS)
 
374
#if defined(USE_NSS_CERTS)
375
375
                                   const base::FilePath& nss_db_path,
376
376
#endif
377
377
                                   gfx::GLImplementation gl_impl,
420
420
 
421
421
  AddFormFactorSpecificCommandLineArguments();
422
422
 
423
 
#if defined(USE_NSS)
 
423
#if defined(USE_NSS_CERTS)
424
424
  if (!nss_db_path.empty()) {
425
425
    // Used for testing
426
426
    PathService::OverrideAndCreateIfNeeded(crypto::DIR_NSSDB,