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

Side by Side Diff: content/app/content_main_runner.cc

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « components/webcrypto/test/test_helpers.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/app/content_main_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include "base/allocator/allocator_extension.h" 9 #include "base/allocator/allocator_extension.h"
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 665 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 // on their own when the browser process goes away. 676 // on their own when the browser process goes away.
677 // 677 //
678 // Note that we *can't* rely on BeingDebugged to catch this case because 678 // Note that we *can't* rely on BeingDebugged to catch this case because
679 // we are the child process, which is not being debugged. 679 // we are the child process, which is not being debugged.
680 // TODO(evanm): move this to some shared subprocess-init function. 680 // TODO(evanm): move this to some shared subprocess-init function.
681 if (!base::debug::BeingDebugged()) 681 if (!base::debug::BeingDebugged())
682 signal(SIGINT, SIG_IGN); 682 signal(SIGINT, SIG_IGN);
683 } 683 }
684 #endif 684 #endif
685 685
686 #if defined(USE_NSS) 686 #if defined(USE_NSS_CERTS)
687 crypto::EarlySetupForNSSInit(); 687 crypto::EarlySetupForNSSInit();
688 #endif 688 #endif
689 689
690 ui::RegisterPathProvider(); 690 ui::RegisterPathProvider();
691 RegisterPathProvider(); 691 RegisterPathProvider();
692 RegisterContentSchemes(true); 692 RegisterContentSchemes(true);
693 693
694 #if defined(OS_ANDROID) 694 #if defined(OS_ANDROID)
695 int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor); 695 int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor);
696 if (icudata_fd != -1) { 696 if (icudata_fd != -1) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
842 842
843 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 843 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
844 }; 844 };
845 845
846 // static 846 // static
847 ContentMainRunner* ContentMainRunner::Create() { 847 ContentMainRunner* ContentMainRunner::Create() {
848 return new ContentMainRunnerImpl(); 848 return new ContentMainRunnerImpl();
849 } 849 }
850 850
851 } // namespace content 851 } // namespace content
OLDNEW
« no previous file with comments | « components/webcrypto/test/test_helpers.cc ('k') | content/ppapi_plugin/ppapi_plugin_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698