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

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

Issue 8120007: Update Breakpad to r842 and fix the Breakpad bootstrap service leak and -10810 errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/app/breakpad_mac_stubs.mm ('k') | chrome/renderer/chrome_render_process_observer.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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/lazy_instance.h" 6 #include "base/lazy_instance.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/metrics/stats_counters.h" 9 #include "base/metrics/stats_counters.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 666
667 NOTREACHED() << "Unknown process type: " << process_type; 667 NOTREACHED() << "Unknown process type: " << process_type;
668 return 1; 668 return 1;
669 } 669 }
670 670
671 virtual void ProcessExiting(const std::string& process_type) OVERRIDE { 671 virtual void ProcessExiting(const std::string& process_type) OVERRIDE {
672 if (SubprocessNeedsResourceBundle(process_type)) 672 if (SubprocessNeedsResourceBundle(process_type))
673 ResourceBundle::CleanupSharedInstance(); 673 ResourceBundle::CleanupSharedInstance();
674 674
675 logging::CleanupChromeLogging(); 675 logging::CleanupChromeLogging();
676
677 #if defined(OS_MACOSX) && defined(GOOGLE_CHROME_BUILD)
678 // TODO(mark): See the TODO(mark) at InitCrashReporter.
679 DestructCrashReporter();
680 #endif // OS_MACOSX && GOOGLE_CHROME_BUILD
681 } 676 }
682 677
683 #if defined(OS_MACOSX) 678 #if defined(OS_MACOSX)
684 virtual bool ProcessRegistersWithSystemProcess( 679 virtual bool ProcessRegistersWithSystemProcess(
685 const std::string& process_type) OVERRIDE { 680 const std::string& process_type) OVERRIDE {
686 return process_type == switches::kNaClLoaderProcess || 681 return process_type == switches::kNaClLoaderProcess ||
687 process_type == switches::kExtensionProcess; 682 process_type == switches::kExtensionProcess;
688 } 683 }
689 684
690 virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE { 685 virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance, 737 DLLEXPORT int __cdecl ChromeMain(HINSTANCE instance,
743 sandbox::SandboxInterfaceInfo* sandbox_info) { 738 sandbox::SandboxInterfaceInfo* sandbox_info) {
744 ChromeMainDelegate chrome_main_delegate; 739 ChromeMainDelegate chrome_main_delegate;
745 return content::ContentMain(instance, sandbox_info, &chrome_main_delegate); 740 return content::ContentMain(instance, sandbox_info, &chrome_main_delegate);
746 #elif defined(OS_POSIX) 741 #elif defined(OS_POSIX)
747 int ChromeMain(int argc, const char** argv) { 742 int ChromeMain(int argc, const char** argv) {
748 ChromeMainDelegate chrome_main_delegate; 743 ChromeMainDelegate chrome_main_delegate;
749 return content::ContentMain(argc, argv, &chrome_main_delegate); 744 return content::ContentMain(argc, argv, &chrome_main_delegate);
750 #endif 745 #endif
751 } 746 }
OLDNEW
« no previous file with comments | « chrome/app/breakpad_mac_stubs.mm ('k') | chrome/renderer/chrome_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698