| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/mus/example/views_examples/views_examples_application_deleg
ate.h" | 5 #include "mash/example/views_examples/views_examples_application_delegate.h" |
| 6 | 6 |
| 7 #include "mojo/application/public/cpp/application_connection.h" | 7 #include "mojo/application/public/cpp/application_connection.h" |
| 8 #include "mojo/application/public/cpp/application_impl.h" | 8 #include "mojo/application/public/cpp/application_impl.h" |
| 9 #include "ui/views/examples/example_base.h" | 9 #include "ui/views/examples/example_base.h" |
| 10 #include "ui/views/examples/examples_window.h" | 10 #include "ui/views/examples/examples_window.h" |
| 11 #include "ui/views/mus/aura_init.h" | 11 #include "ui/views/mus/aura_init.h" |
| 12 #include "ui/views/mus/window_manager_connection.h" | 12 #include "ui/views/mus/window_manager_connection.h" |
| 13 | 13 |
| 14 ViewsExamplesApplicationDelegate::ViewsExamplesApplicationDelegate() {} | 14 ViewsExamplesApplicationDelegate::ViewsExamplesApplicationDelegate() {} |
| 15 | 15 |
| 16 ViewsExamplesApplicationDelegate::~ViewsExamplesApplicationDelegate() { | 16 ViewsExamplesApplicationDelegate::~ViewsExamplesApplicationDelegate() { |
| 17 } | 17 } |
| 18 | 18 |
| 19 void ViewsExamplesApplicationDelegate::Initialize(mojo::ApplicationImpl* app) { | 19 void ViewsExamplesApplicationDelegate::Initialize(mojo::ApplicationImpl* app) { |
| 20 tracing_.Initialize(app); | 20 tracing_.Initialize(app); |
| 21 aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak")); | 21 aura_init_.reset(new views::AuraInit(app, "views_mus_resources.pak")); |
| 22 | 22 |
| 23 views::WindowManagerConnection::Create(app); | 23 views::WindowManagerConnection::Create(app); |
| 24 | 24 |
| 25 views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE, | 25 views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE, |
| 26 nullptr, nullptr); | 26 nullptr, nullptr); |
| 27 } | 27 } |
| 28 | 28 |
| 29 bool ViewsExamplesApplicationDelegate::ConfigureIncomingConnection( | 29 bool ViewsExamplesApplicationDelegate::ConfigureIncomingConnection( |
| 30 mojo::ApplicationConnection* connection) { | 30 mojo::ApplicationConnection* connection) { |
| 31 return false; | 31 return false; |
| 32 } | 32 } |
| OLD | NEW |