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

Unified Diff: ui/views_content_client/views_content_client.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: rebase for horrible copyright header change in revert CL 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
« no previous file with comments | « ui/views_content_client/views_content_client.h ('k') | ui/views_content_client/views_content_client.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views_content_client/views_content_client.cc
diff --git a/ash/shell/shell_main.cc b/ui/views_content_client/views_content_client.cc
similarity index 35%
copy from ash/shell/shell_main.cc
copy to ui/views_content_client/views_content_client.cc
index 021351112ceb03e32f24e35e7f738dcb0d094857..a46cf8a622d7533206ff2a12e7640963ef33c87f 100644
--- a/ash/shell/shell_main.cc
+++ b/ui/views_content_client/views_content_client.cc
@@ -2,31 +2,40 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/shell/content_client/shell_main_delegate.h"
+#include "ui/views_content_client/views_content_client.h"
+
#include "content/public/app/content_main.h"
+#include "ui/views_content_client/views_content_main_delegate.h"
-#if defined(OS_WIN)
-#include "content/public/app/startup_helper_win.h"
-#include "sandbox/win/src/sandbox_types.h"
-#endif
+namespace ui {
#if defined(OS_WIN)
-int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
+ViewsContentClient::ViewsContentClient(
+ HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info)
+ : instance_(instance), sandbox_info_(sandbox_info) {
+}
#else
-int main(int argc, const char** argv) {
+ViewsContentClient::ViewsContentClient(int argc, const char** argv)
+ : argc_(argc), argv_(argv) {
+}
#endif
- ash::shell::ShellMainDelegate delegate;
+
+ViewsContentClient::~ViewsContentClient() {
+}
+
+int ViewsContentClient::RunMain() {
+ ViewsContentMainDelegate 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 ui
« no previous file with comments | « ui/views_content_client/views_content_client.h ('k') | ui/views_content_client/views_content_client.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698