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

Side by Side Diff: chrome/app/chrome_main.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/browser_main_gtk.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/app/chrome_main.h" 5 #include "chrome/app/chrome_main.h"
6 6
7 #include "app/app_paths.h" 7 #include "app/app_paths.h"
8 #include "base/at_exit.h" 8 #include "base/at_exit.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/debug/debugger.h" 10 #include "base/debug/debugger.h"
11 #include "base/i18n/icu_util.h" 11 #include "base/i18n/icu_util.h"
12 #include "base/mac/scoped_nsautorelease_pool.h" 12 #include "base/mac/scoped_nsautorelease_pool.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "base/metrics/stats_counters.h" 14 #include "base/metrics/stats_counters.h"
15 #include "base/metrics/stats_table.h" 15 #include "base/metrics/stats_table.h"
16 #include "base/nss_util.h"
17 #include "base/path_service.h" 16 #include "base/path_service.h"
18 #include "base/process_util.h" 17 #include "base/process_util.h"
19 #include "base/string_number_conversions.h" 18 #include "base/string_number_conversions.h"
20 #include "base/string_util.h" 19 #include "base/string_util.h"
21 #include "base/utf_string_conversions.h" 20 #include "base/utf_string_conversions.h"
22 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "crypto/nss_util.h"
23 #include "chrome/browser/defaults.h" 23 #include "chrome/browser/defaults.h"
24 #include "chrome/browser/diagnostics/diagnostics_main.h" 24 #include "chrome/browser/diagnostics/diagnostics_main.h"
25 #include "chrome/browser/platform_util.h" 25 #include "chrome/browser/platform_util.h"
26 #include "chrome/common/chrome_constants.h" 26 #include "chrome/common/chrome_constants.h"
27 #include "chrome/common/chrome_content_client.h" 27 #include "chrome/common/chrome_content_client.h"
28 #include "chrome/common/chrome_content_gpu_client.h" 28 #include "chrome/common/chrome_content_gpu_client.h"
29 #include "chrome/common/chrome_content_plugin_client.h" 29 #include "chrome/common/chrome_content_plugin_client.h"
30 #include "chrome/common/chrome_counters.h" 30 #include "chrome/common/chrome_counters.h"
31 #include "chrome/common/chrome_paths.h" 31 #include "chrome/common/chrome_paths.h"
32 #include "chrome/common/chrome_paths_internal.h" 32 #include "chrome/common/chrome_paths_internal.h"
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
582 // Note that we *can't* rely on BeingDebugged to catch this case because we 582 // Note that we *can't* rely on BeingDebugged to catch this case because we
583 // are the child process, which is not being debugged. 583 // are the child process, which is not being debugged.
584 // TODO(evanm): move this to some shared subprocess-init function. 584 // TODO(evanm): move this to some shared subprocess-init function.
585 if (!base::debug::BeingDebugged()) 585 if (!base::debug::BeingDebugged())
586 signal(SIGINT, SIG_IGN); 586 signal(SIGINT, SIG_IGN);
587 #endif 587 #endif
588 } 588 }
589 SetupCRT(command_line); 589 SetupCRT(command_line);
590 590
591 #if defined(USE_NSS) 591 #if defined(USE_NSS)
592 base::EarlySetupForNSSInit(); 592 crypto::EarlySetupForNSSInit();
593 #endif 593 #endif
594 594
595 // Initialize the Chrome path provider. 595 // Initialize the Chrome path provider.
596 app::RegisterPathProvider(); 596 app::RegisterPathProvider();
597 ui::RegisterPathProvider(); 597 ui::RegisterPathProvider();
598 chrome::RegisterPathProvider(); 598 chrome::RegisterPathProvider();
599 content::RegisterPathProvider(); 599 content::RegisterPathProvider();
600 600
601 #if defined(OS_MACOSX) 601 #if defined(OS_MACOSX)
602 // On the Mac, the child executable lives at a predefined location within 602 // On the Mac, the child executable lives at a predefined location within
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 805
806 if (SubprocessNeedsResourceBundle(process_type)) 806 if (SubprocessNeedsResourceBundle(process_type))
807 ResourceBundle::CleanupSharedInstance(); 807 ResourceBundle::CleanupSharedInstance();
808 808
809 logging::CleanupChromeLogging(); 809 logging::CleanupChromeLogging();
810 810
811 chrome_main::LowLevelShutdown(); 811 chrome_main::LowLevelShutdown();
812 812
813 return exit_code; 813 return exit_code;
814 } 814 }
OLDNEW
« no previous file with comments | « chrome/DEPS ('k') | chrome/browser/browser_main_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698