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

Unified Diff: ui/views/examples/content_client/examples_main.cc

Issue 284113011: Repurpose views+content example into a generic multiprocess views runtime (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use sandbox boilerplate for now Created 6 years, 7 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: ui/views/examples/content_client/examples_main.cc
diff --git a/ui/views/examples/content_client/examples_main.cc b/ui/views/examples/content_client/examples_main.cc
index 559838713e8634bfb3b369f17893a7e176a7b413..5ce4c87f4901a325ad900c21576cf1a6269ad98e 100644
--- a/ui/views/examples/content_client/examples_main.cc
+++ b/ui/views/examples/content_client/examples_main.cc
@@ -2,31 +2,42 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/examples/content_client/examples_main.h"
+
#include "content/public/app/content_main.h"
#include "ui/views/examples/content_client/examples_main_delegate.h"
-#if defined(OS_WIN)
-#include "content/public/app/startup_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
-#endif
+namespace views {
+namespace examples {
#if defined(OS_WIN)
-int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
+ExamplesMainParams::ExamplesMainParams(
+ HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info)
+ : instance_(instance), sandbox_info_(sandbox_info) {
+}
#else
-int main(int argc, const char** argv) {
+ExamplesMainParams::ExamplesMainParams(int argc, const char** argv)
+ : argc_(argc), argv_(argv) {
+}
#endif
- views::examples::ExamplesMainDelegate delegate;
+
+ExamplesMainParams::~ExamplesMainParams() {
+}
+
+int ExamplesMainParams::RunMain() {
+ views::examples::ExamplesMainDelegate delegate(this);
content::ContentMainParams params(&delegate);
#if defined(OS_WIN)
- sandbox::SandboxInterfaceInfo sandbox_info = {0};
- content::InitializeSandboxInfo(&sandbox_info);
- params.instance = instance;
- params.sandbox_info = &sandbox_info;
+ params.instance = instance_;
+ params.sandbox_info = sandbox_info_;
#else
- params.argc = argc;
- params.argv = argv;
+ params.argc = argc_;
+ params.argv = argv_;
#endif
return content::ContentMain(params);
}
+
+} // namespace examples
+} // namespace views

Powered by Google App Engine
This is Rietveld 408576698