diff options
author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 19:57:05 +0000 |
---|---|---|
committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-20 19:57:05 +0000 |
commit | 16320ea7fee687b6642f8d9d00a2624f4920bc2e (patch) | |
tree | 5c2ad7861807002f605d3aebed1b8c9dd095513e /content/app | |
parent | e121969dd45f75c4a8c09e8cca254f89375ec377 (diff) | |
download | chromium_src-16320ea7fee687b6642f8d9d00a2624f4920bc2e.zip chromium_src-16320ea7fee687b6642f8d9d00a2624f4920bc2e.tar.gz chromium_src-16320ea7fee687b6642f8d9d00a2624f4920bc2e.tar.bz2 |
Move ContentMainDelegate to content/public/.
Mostly a trivial move since the implementation for the class (now
deleted) was do-nothing and the only subclass that didn't have a full
implementation was ShellMainDelegate.
BUG=98716
TEST=it builds + existing tests
Review URL: http://codereview.chromium.org/8356025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
-rw-r--r-- | content/app/content_main.cc | 2 | ||||
-rw-r--r-- | content/app/content_main_delegate.cc | 56 | ||||
-rw-r--r-- | content/app/content_main_delegate.h | 74 |
3 files changed, 1 insertions, 131 deletions
diff --git a/content/app/content_main.cc b/content/app/content_main.cc index 85d6144..4fdf644 100644 --- a/content/app/content_main.cc +++ b/content/app/content_main.cc @@ -15,7 +15,6 @@ #include "base/process_util.h" #include "base/stringprintf.h" #include "base/string_number_conversions.h" -#include "content/app/content_main_delegate.h" #include "content/app/startup_helper_win.h" #include "content/browser/browser_main.h" #include "content/common/content_constants.h" @@ -23,6 +22,7 @@ #include "content/common/main_function_params.h" #include "content/common/sandbox_init_wrapper.h" #include "content/common/set_process_title.h" +#include "content/public/app/content_main_delegate.h" #include "content/public/common/content_switches.h" #include "crypto/nss_util.h" #include "ipc/ipc_switches.h" diff --git a/content/app/content_main_delegate.cc b/content/app/content_main_delegate.cc deleted file mode 100644 index bf1e266..0000000 --- a/content/app/content_main_delegate.cc +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "content/app/content_main_delegate.h" - -#include "base/logging.h" - -namespace content { - -ContentMainDelegate::~ContentMainDelegate() { -} - -bool ContentMainDelegate::BasicStartupComplete(int* exit_code) { - return false; -} - -void ContentMainDelegate::PreSandboxStartup() { -} - -void ContentMainDelegate::SandboxInitialized(const std::string& process_type) { -} - -int ContentMainDelegate::RunProcess(const std::string& process_type, - const MainFunctionParams& main_function_params) { - NOTREACHED(); - return -1; -} - -void ContentMainDelegate::ProcessExiting(const std::string& process_type) { -} - -#if defined(OS_MACOSX) -bool ContentMainDelegate::ProcessRegistersWithSystemProcess( - const std::string& process_type) { - return false; -} - -bool ContentMainDelegate::ShouldSendMachPort(const std::string& process_type) { - return false; -} - -bool ContentMainDelegate::DelaySandboxInitialization( - const std::string& process_type) { - return false; -} -#elif defined(OS_POSIX) -ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() { - return NULL; -} - -void ContentMainDelegate::ZygoteForked() { -} -#endif // OS_MACOSX - -} // namespace content diff --git a/content/app/content_main_delegate.h b/content/app/content_main_delegate.h deleted file mode 100644 index 361afa2..0000000 --- a/content/app/content_main_delegate.h +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CONTENT_APP_CONTENT_MAIN_DELEGATE_H_ -#define CONTENT_APP_CONTENT_MAIN_DELEGATE_H_ -#pragma once - -#include <string> - -#include "build/build_config.h" -#include "content/common/content_export.h" - -struct MainFunctionParams; -class ZygoteForkDelegate; - -namespace content { - -class CONTENT_EXPORT ContentMainDelegate { - public: - virtual ~ContentMainDelegate(); - - // Tells the embedder that the absolute basic startup has been done, i.e. it's - // now safe to create singletons and check the command line. Return true if - // the process should exit afterwards, and if so, |exit_code| should be set. - // This is the place for embedder to do the things that must happen at the - // start. Most of its startup code should be in the methods below. - virtual bool BasicStartupComplete(int* exit_code); - - // This is where the embedder puts all of its startup code that needs to run - // before the sandbox is engaged. - virtual void PreSandboxStartup(); - - // This is where the embedder can add startup code to run after the sandbox - // has been initialized. - virtual void SandboxInitialized(const std::string& process_type); - - // Asks the embedder to start a process that content doesn't know about. - virtual int RunProcess(const std::string& process_type, - const MainFunctionParams& main_function_params); - - // Called right before the process exits. - virtual void ProcessExiting(const std::string& process_type); - -#if defined(OS_MACOSX) - // Returns true if the process registers with the system monitor, so that we - // can allocate an IO port for it before the sandbox is initialized. Embedders - // are called only for process types that content doesn't know about. - virtual bool ProcessRegistersWithSystemProcess( - const std::string& process_type); - - // Used to determine if we should send the mach port to the parent process or - // not. The embedder usually sends it for all child processes, use this to - // override this behavior. - virtual bool ShouldSendMachPort(const std::string& process_type); - - // Allows the embedder to override initializing the sandbox. This is needed - // because some processes might not want to enable it right away or might not - // want it at all. - virtual bool DelaySandboxInitialization(const std::string& process_type); - -#elif defined(OS_POSIX) - // Tells the embedder that the zygote process is starting, and allows it to - // specify a zygote delegate if it wishes. - virtual ZygoteForkDelegate* ZygoteStarting(); - - // Called every time the zygote process forks. - virtual void ZygoteForked(); -#endif // OS_MACOSX -}; - -} // namespace content - -#endif // CONTENT_APP_CONTENT_MAIN_DELEGATE_H_ |