chrome/app/chrome_main_delegate.h - Issue 962753002: Revert the TerminateOnHeapCorruption experiment.

Side by Side Diff: chrome/app/chrome_main_delegate.h

Issue 962753002: Revert the TerminateOnHeapCorruption experiment. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 5 years, 9 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 | « no previous file | chrome/app/chrome_main_delegate.cc » ('j') | no next file with comments »

OLD	NEW
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 #ifndef CHROME_APP_CHROME_MAIN_DELEGATE_H_	5 #ifndef CHROME_APP_CHROME_MAIN_DELEGATE_H_

6 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_	6 #define CHROME_APP_CHROME_MAIN_DELEGATE_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "chrome/common/chrome_content_client.h"	9 #include "chrome/common/chrome_content_client.h"

10 #include "content/public/app/content_main_delegate.h"	10 #include "content/public/app/content_main_delegate.h"

(...skipping 22 matching lines...) Expand all Loading...
33 void ProcessExiting(const std::string& process_type) override;	33 void ProcessExiting(const std::string& process_type) override;

34 #if defined(OS_MACOSX)	34 #if defined(OS_MACOSX)

35 bool ProcessRegistersWithSystemProcess(	35 bool ProcessRegistersWithSystemProcess(

36 const std::string& process_type) override;	36 const std::string& process_type) override;

37 bool ShouldSendMachPort(const std::string& process_type) override;	37 bool ShouldSendMachPort(const std::string& process_type) override;

38 bool DelaySandboxInitialization(const std::string& process_type) override;	38 bool DelaySandboxInitialization(const std::string& process_type) override;

39 #elif defined(OS_POSIX) && !defined(OS_ANDROID)	39 #elif defined(OS_POSIX) && !defined(OS_ANDROID)

40 void ZygoteStarting(	40 void ZygoteStarting(

41 ScopedVector<content::ZygoteForkDelegate>* delegates) override;	41 ScopedVector<content::ZygoteForkDelegate>* delegates) override;

42 void ZygoteForked() override;	42 void ZygoteForked() override;

43 #elif defined(OS_WIN)

44 virtual bool ShouldEnableTerminationOnHeapCorruption() override;

45 #endif	43 #endif

46	44

47 content::ContentBrowserClient* CreateContentBrowserClient() override;	45 content::ContentBrowserClient* CreateContentBrowserClient() override;

48 content::ContentPluginClient* CreateContentPluginClient() override;	46 content::ContentPluginClient* CreateContentPluginClient() override;

49 content::ContentRendererClient* CreateContentRendererClient() override;	47 content::ContentRendererClient* CreateContentRendererClient() override;

50 content::ContentUtilityClient* CreateContentUtilityClient() override;	48 content::ContentUtilityClient* CreateContentUtilityClient() override;

51	49

52 #if defined(OS_MACOSX)	50 #if defined(OS_MACOSX)

53 void InitMacCrashReporter(const base::CommandLine& command_line,	51 void InitMacCrashReporter(const base::CommandLine& command_line,

54 const std::string& process_type);	52 const std::string& process_type);

55 #endif // defined(OS_MACOSX)	53 #endif // defined(OS_MACOSX)

56	54

57 ChromeContentClient chrome_content_client_;	55 ChromeContentClient chrome_content_client_;

58	56

59 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);	57 DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegate);

60 };	58 };

61	59

62 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_	60 #endif // CHROME_APP_CHROME_MAIN_DELEGATE_H_

OLD	NEW