| Index: ui/views/examples/content_client/examples_browser_main_parts.cc
|
| diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc
|
| index 121678f224a0ec387b90f582a4d6608c987fbd33..25f0713fd5343cfc094a77c56007aca542022e70 100644
|
| --- a/ui/views/examples/content_client/examples_browser_main_parts.cc
|
| +++ b/ui/views/examples/content_client/examples_browser_main_parts.cc
|
| @@ -16,7 +16,7 @@
|
| #include "ui/aura/env.h"
|
| #include "ui/base/ime/input_method_initializer.h"
|
| #include "ui/gfx/screen.h"
|
| -#include "ui/views/examples/examples_window_with_content.h"
|
| +#include "ui/views/examples/content_client/examples_main.h"
|
| #include "ui/views/test/desktop_test_views_delegate.h"
|
| #include "ui/views/widget/native_widget_aura.h"
|
| #include "ui/wm/core/wm_state.h"
|
| @@ -35,7 +35,9 @@ namespace views {
|
| namespace examples {
|
|
|
| ExamplesBrowserMainParts::ExamplesBrowserMainParts(
|
| - const content::MainFunctionParams& parameters) {
|
| + const content::MainFunctionParams& content_params,
|
| + ExamplesMainParams* examples_params)
|
| + : examples_params_(examples_params) {
|
| }
|
|
|
| ExamplesBrowserMainParts::~ExamplesBrowserMainParts() {
|
| @@ -66,8 +68,7 @@ void ExamplesBrowserMainParts::PreMainMessageLoopRun() {
|
| #endif
|
| views_delegate_.reset(new DesktopTestViewsDelegate);
|
|
|
| - ShowExamplesWindowWithContent(
|
| - QUIT_ON_CLOSE, browser_context_.get(), window_context);
|
| + examples_params_->task().Run(browser_context_.get(), window_context);
|
| }
|
|
|
| void ExamplesBrowserMainParts::PostMainMessageLoopRun() {
|
|
|