| 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..24efe8c544b92a9cb5dee17f320424900a9df40c 100644
|
| --- a/ui/views/examples/content_client/examples_main.cc
|
| +++ b/ui/views/examples/content_client/examples_main.cc
|
| @@ -2,6 +2,8 @@
|
| // 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"
|
|
|
| @@ -10,23 +12,35 @@
|
| #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)
|
| + : instance_(instance) {
|
| +}
|
| #else
|
| -int main(int argc, const char** argv) {
|
| +ExamplesMainParams::ExamplesMainParams(int argc, const char** argv)
|
| + : argc_(argc), argv_(argv) {
|
| +}
|
| #endif
|
| - views::examples::ExamplesMainDelegate delegate;
|
| +
|
| +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.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
|
|
|