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

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: long line 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
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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 // on their own when the browser process goes away. 669 // on their own when the browser process goes away.
670 // 670 //
671 // Note that we *can't* rely on BeingDebugged to catch this case because 671 // Note that we *can't* rely on BeingDebugged to catch this case because
672 // we are the child process, which is not being debugged. 672 // we are the child process, which is not being debugged.
673 // TODO(evanm): move this to some shared subprocess-init function. 673 // TODO(evanm): move this to some shared subprocess-init function.
674 if (!base::debug::BeingDebugged()) 674 if (!base::debug::BeingDebugged())
675 signal(SIGINT, SIG_IGN); 675 signal(SIGINT, SIG_IGN);
676 } 676 }
677 #endif 677 #endif
678 678
679 #if defined(USE_NSS) 679 #if defined(USE_NSS_CERTS)
680 crypto::EarlySetupForNSSInit(); 680 crypto::EarlySetupForNSSInit();
681 #endif 681 #endif
682 682
683 ui::RegisterPathProvider(); 683 ui::RegisterPathProvider();
684 RegisterPathProvider(); 684 RegisterPathProvider();
685 RegisterContentSchemes(true); 685 RegisterContentSchemes(true);
686 686
687 #if defined(OS_ANDROID) 687 #if defined(OS_ANDROID)
688 int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor); 688 int icudata_fd = g_fds->MaybeGet(kAndroidICUDataDescriptor);
689 if (icudata_fd != -1) { 689 if (icudata_fd != -1) {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 835
836 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 836 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
837 }; 837 };
838 838
839 // static 839 // static
840 ContentMainRunner* ContentMainRunner::Create() { 840 ContentMainRunner* ContentMainRunner::Create() {
841 return new ContentMainRunnerImpl(); 841 return new ContentMainRunnerImpl();
842 } 842 }
843 843
844 } // namespace content 844 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698