
Automated patch, intended to be effectively a no-op. Context: https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email&utm_source=footer As of https://crrev.com/1204351, absl::optional is now a type alias for std::optional. We should migrate toward it. Script: ``` function replace { echo "Replacing $1 by $2" git grep -l "$1" \ | cut -f1 -d: \ | grep \ -e "^content" \ | sort \ | uniq \ | grep \ -e "\.h" \ -e "\.cc" \ -e "\.mm" \ -e "\.py" \ | xargs sed -i "s/$1/$2/g" } replace "absl::make_optional" "std::make_optional" replace "absl::optional" "std::optional" replace "absl::nullopt" "std::nullopt" replace "absl::in_place" "std::in_place" replace "absl::in_place_t" "std::in_place_t" replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>" git cl format ``` # Skipping unrelated "check_network_annotation" errors. NOTRY=True Bug: chromium:1500249 Change-Id: Icfd31a71d8faf63a2e8d5401127e7ee74cc1c413 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5185537 Auto-Submit: Arthur Sonzogni <arthursonzogni@chromium.org> Commit-Queue: Arthur Sonzogni <arthursonzogni@chromium.org> Owners-Override: Avi Drissman <avi@chromium.org> Reviewed-by: Avi Drissman <avi@chromium.org> Reviewed-by: danakj <danakj@chromium.org> Cr-Commit-Position: refs/heads/main@{#1245739}
81 lines
2.3 KiB
C++
81 lines
2.3 KiB
C++
// Copyright 2018 The Chromium Authors
|
|
// 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_RUNNER_IMPL_H_
|
|
#define CONTENT_APP_CONTENT_MAIN_RUNNER_IMPL_H_
|
|
|
|
#include <memory>
|
|
#include <optional>
|
|
|
|
#include "base/functional/callback_helpers.h"
|
|
#include "base/memory/raw_ptr.h"
|
|
#include "content/browser/startup_data_impl.h"
|
|
#include "content/public/app/content_main.h"
|
|
#include "content/public/app/content_main_runner.h"
|
|
#include "content/public/common/main_function_params.h"
|
|
#include "mojo/core/embedder/scoped_ipc_support.h"
|
|
|
|
namespace base {
|
|
class AtExitManager;
|
|
} // namespace base
|
|
|
|
namespace discardable_memory {
|
|
class DiscardableSharedMemoryManager;
|
|
}
|
|
|
|
namespace content {
|
|
class MojoIpcSupport;
|
|
|
|
class ContentMainRunnerImpl : public ContentMainRunner {
|
|
public:
|
|
static std::unique_ptr<ContentMainRunnerImpl> Create();
|
|
|
|
ContentMainRunnerImpl();
|
|
|
|
ContentMainRunnerImpl(const ContentMainRunnerImpl&) = delete;
|
|
ContentMainRunnerImpl& operator=(const ContentMainRunnerImpl&) = delete;
|
|
|
|
~ContentMainRunnerImpl() override;
|
|
|
|
int TerminateForFatalInitializationError();
|
|
|
|
// ContentMainRunner:
|
|
int Initialize(ContentMainParams params) override;
|
|
void ReInitializeParams(ContentMainParams new_params) override;
|
|
int Run() override;
|
|
void Shutdown() override;
|
|
|
|
private:
|
|
int RunBrowser(MainFunctionParams main_function_params,
|
|
bool start_minimal_browser);
|
|
|
|
bool is_browser_main_loop_started_ = false;
|
|
|
|
std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
|
|
discardable_shared_memory_manager_;
|
|
std::unique_ptr<MojoIpcSupport> mojo_ipc_support_;
|
|
|
|
// True if the runner has been initialized.
|
|
bool is_initialized_ = false;
|
|
|
|
// True if the runner has been shut down.
|
|
bool is_shutdown_ = false;
|
|
|
|
// Set to true if this content process's main function should enable startup
|
|
// tracing after initializing Mojo.
|
|
bool needs_startup_tracing_after_mojo_init_ = false;
|
|
|
|
// The delegate will outlive this object.
|
|
raw_ptr<ContentMainDelegate> delegate_ = nullptr;
|
|
|
|
std::unique_ptr<base::AtExitManager> exit_manager_;
|
|
|
|
// Received in Initialize(), handed-off in Run().
|
|
std::optional<ContentMainParams> content_main_params_;
|
|
};
|
|
|
|
} // namespace content
|
|
|
|
#endif // CONTENT_APP_CONTENT_MAIN_RUNNER_IMPL_H_
|