| Index: mash/example/views_examples/views_examples_application_delegate.cc
|
| diff --git a/mash/example/views_examples/views_examples_application_delegate.cc b/mash/example/views_examples/views_examples_application_delegate.cc
|
| index 4132e405d1167a734e300c5c0f18c593fba4a3bf..dc675ab318b35c79f6a463634eed2aa13eb02b45 100644
|
| --- a/mash/example/views_examples/views_examples_application_delegate.cc
|
| +++ b/mash/example/views_examples/views_examples_application_delegate.cc
|
| @@ -5,7 +5,7 @@
|
| #include "mash/example/views_examples/views_examples_application_delegate.h"
|
|
|
| #include "mojo/shell/public/cpp/application_connection.h"
|
| -#include "mojo/shell/public/cpp/application_impl.h"
|
| +#include "mojo/shell/public/cpp/shell.h"
|
| #include "ui/views/examples/example_base.h"
|
| #include "ui/views/examples/examples_window.h"
|
| #include "ui/views/mus/aura_init.h"
|
| @@ -16,11 +16,13 @@ ViewsExamplesApplicationDelegate::ViewsExamplesApplicationDelegate() {}
|
| ViewsExamplesApplicationDelegate::~ViewsExamplesApplicationDelegate() {
|
| }
|
|
|
| -void ViewsExamplesApplicationDelegate::Initialize(mojo::ApplicationImpl* app) {
|
| - tracing_.Initialize(app);
|
| - aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak"));
|
| +void ViewsExamplesApplicationDelegate::Initialize(mojo::Shell* shell,
|
| + const std::string& url,
|
| + uint32_t id) {
|
| + tracing_.Initialize(shell, url);
|
| + aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
|
|
|
| - views::WindowManagerConnection::Create(app);
|
| + views::WindowManagerConnection::Create(shell);
|
|
|
| views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE,
|
| nullptr, nullptr);
|
|
|