| 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 "mash/example/views_examples/views_examples_application_delegate.h" | 5 #include "mash/example/views_examples/views_examples_application_delegate.h" |
| 6 | 6 |
| 7 #include "mojo/shell/public/cpp/connection.h" | 7 #include "services/shell/public/cpp/connection.h" |
| 8 #include "mojo/shell/public/cpp/connector.h" | 8 #include "services/shell/public/cpp/connector.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( | 19 void ViewsExamplesApplicationDelegate::Initialize( |
| 20 mojo::Connector* connector, | 20 mojo::Connector* connector, |
| 21 const mojo::Identity& identity, | 21 const mojo::Identity& identity, |
| 22 uint32_t id) { | 22 uint32_t id) { |
| 23 tracing_.Initialize(connector, identity.name()); | 23 tracing_.Initialize(connector, identity.name()); |
| 24 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); | 24 aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak")); |
| 25 | 25 |
| 26 views::WindowManagerConnection::Create(connector); | 26 views::WindowManagerConnection::Create(connector); |
| 27 | 27 |
| 28 views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE, | 28 views::examples::ShowExamplesWindow(views::examples::DO_NOTHING_ON_CLOSE, |
| 29 nullptr, nullptr); | 29 nullptr, nullptr); |
| 30 } | 30 } |
| 31 | 31 |
| 32 bool ViewsExamplesApplicationDelegate::AcceptConnection( | 32 bool ViewsExamplesApplicationDelegate::AcceptConnection( |
| 33 mojo::Connection* connection) { | 33 mojo::Connection* connection) { |
| 34 return false; | 34 return false; |
| 35 } | 35 } |
| OLD | NEW |