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

Unified Diff: headless/app/headless_shell_main_delegate.h

Issue 1430673002: Headless demo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
Index: headless/app/headless_shell_main_delegate.h
diff --git a/content/shell/app/shell_main_delegate.h b/headless/app/headless_shell_main_delegate.h
similarity index 67%
copy from content/shell/app/shell_main_delegate.h
copy to headless/app/headless_shell_main_delegate.h
index f8439bc5f111f8b7a2e7a83a5afc7772b4fac37c..fadbe35ad01e884d4c8231ba32e6076b8110da48 100644
--- a/content/shell/app/shell_main_delegate.h
+++ b/headless/app/headless_shell_main_delegate.h
@@ -1,11 +1,12 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2015 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_SHELL_APP_SHELL_MAIN_DELEGATE_H_
-#define CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
+#ifndef CONTENT_SHELL_HEADLESS_HEADLESS_TEST_SHELL_MAIN_DELEGATE_H_
+#define CONTENT_SHELL_HEADLESS_HEADLESS_TEST_SHELL_MAIN_DELEGATE_H_
#include "base/compiler_specific.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "content/public/app/content_main_delegate.h"
#include "content/shell/common/shell_content_client.h"
@@ -15,42 +16,32 @@ class ShellContentBrowserClient;
class ShellContentRendererClient;
class ShellContentUtilityClient;
-#if defined(OS_ANDROID)
-class BrowserMainRunner;
-#endif
-
-class ShellMainDelegate : public ContentMainDelegate {
+class HeadlessShellMainDelegate : public ContentMainDelegate {
public:
- ShellMainDelegate();
- ~ShellMainDelegate() override;
+ HeadlessShellMainDelegate();
+ ~HeadlessShellMainDelegate() override;
// ContentMainDelegate implementation:
bool BasicStartupComplete(int* exit_code) override;
void PreSandboxStartup() override;
int RunProcess(const std::string& process_type,
const MainFunctionParams& main_function_params) override;
-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
void ZygoteForked() override;
-#endif
ContentBrowserClient* CreateContentBrowserClient() override;
ContentRendererClient* CreateContentRendererClient() override;
ContentUtilityClient* CreateContentUtilityClient() override;
+ private:
static void InitializeResourceBundle();
- private:
scoped_ptr<ShellContentBrowserClient> browser_client_;
scoped_ptr<ShellContentRendererClient> renderer_client_;
scoped_ptr<ShellContentUtilityClient> utility_client_;
ShellContentClient content_client_;
-#if defined(OS_ANDROID)
- scoped_ptr<BrowserMainRunner> browser_runner_;
-#endif
-
- DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);
+ DISALLOW_COPY_AND_ASSIGN(HeadlessShellMainDelegate);
};
} // namespace content
-#endif // CONTENT_SHELL_APP_SHELL_MAIN_DELEGATE_H_
+#endif // CONTENT_SHELL_HEADLESS_HEADLESS_TEST_SHELL_MAIN_DELEGATE_H_

Powered by Google App Engine
This is Rietveld 408576698