| Index: chrome/app/chrome_main_delegate.h
|
| diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h
|
| index 08b7715e44c695b2e693c0f63387656b29524876..4b8bf5f36ea49eda12070b2f0029e70880e39f9e 100644
|
| --- a/chrome/app/chrome_main_delegate.h
|
| +++ b/chrome/app/chrome_main_delegate.h
|
| @@ -21,23 +21,22 @@ class CommandLine;
|
| class ChromeMainDelegate : public content::ContentMainDelegate {
|
| public:
|
| ChromeMainDelegate();
|
| - virtual ~ChromeMainDelegate();
|
| + ~ChromeMainDelegate() override;
|
|
|
| protected:
|
| // content::ContentMainDelegate implementation:
|
| - virtual bool BasicStartupComplete(int* exit_code) override;
|
| - virtual void PreSandboxStartup() override;
|
| - virtual void SandboxInitialized(const std::string& process_type) override;
|
| - virtual int RunProcess(
|
| + bool BasicStartupComplete(int* exit_code) override;
|
| + void PreSandboxStartup() override;
|
| + void SandboxInitialized(const std::string& process_type) override;
|
| + int RunProcess(
|
| const std::string& process_type,
|
| const content::MainFunctionParams& main_function_params) override;
|
| - virtual void ProcessExiting(const std::string& process_type) override;
|
| + void ProcessExiting(const std::string& process_type) override;
|
| #if defined(OS_MACOSX)
|
| - virtual bool ProcessRegistersWithSystemProcess(
|
| - const std::string& process_type) override;
|
| - virtual bool ShouldSendMachPort(const std::string& process_type) override;
|
| - virtual bool DelaySandboxInitialization(
|
| + bool ProcessRegistersWithSystemProcess(
|
| const std::string& process_type) override;
|
| + bool ShouldSendMachPort(const std::string& process_type) override;
|
| + bool DelaySandboxInitialization(const std::string& process_type) override;
|
| #elif defined(OS_POSIX) && !defined(OS_ANDROID)
|
| virtual void ZygoteStarting(
|
| ScopedVector<content::ZygoteForkDelegate>* delegates) override;
|
| @@ -46,11 +45,10 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
|
| virtual bool ShouldEnableTerminationOnHeapCorruption() override;
|
| #endif
|
|
|
| - virtual content::ContentBrowserClient* CreateContentBrowserClient() override;
|
| - virtual content::ContentPluginClient* CreateContentPluginClient() override;
|
| - virtual content::ContentRendererClient*
|
| - CreateContentRendererClient() override;
|
| - virtual content::ContentUtilityClient* CreateContentUtilityClient() override;
|
| + content::ContentBrowserClient* CreateContentBrowserClient() override;
|
| + content::ContentPluginClient* CreateContentPluginClient() override;
|
| + content::ContentRendererClient* CreateContentRendererClient() override;
|
| + content::ContentUtilityClient* CreateContentUtilityClient() override;
|
|
|
| #if defined(OS_MACOSX)
|
| void InitMacCrashReporter(const base::CommandLine& command_line,
|
|
|