| 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/system_ui/system_ui.h" | 5 #include "mash/system_ui/system_ui.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "components/mus/public/cpp/property_type_converters.h" | 10 #include "components/mus/public/cpp/property_type_converters.h" |
| 11 #include "mash/wm/public/interfaces/container.mojom.h" | 11 #include "mash/wm/public/interfaces/container.mojom.h" |
| 12 #include "mojo/application/public/cpp/application_connection.h" | 12 #include "mojo/shell/public/cpp/application_connection.h" |
| 13 #include "mojo/application/public/cpp/application_impl.h" | 13 #include "mojo/shell/public/cpp/application_impl.h" |
| 14 #include "ui/gfx/canvas.h" | 14 #include "ui/gfx/canvas.h" |
| 15 #include "ui/views/mus/aura_init.h" | 15 #include "ui/views/mus/aura_init.h" |
| 16 #include "ui/views/mus/native_widget_mus.h" | 16 #include "ui/views/mus/native_widget_mus.h" |
| 17 #include "ui/views/mus/window_manager_connection.h" | 17 #include "ui/views/mus/window_manager_connection.h" |
| 18 #include "ui/views/widget/widget_delegate.h" | 18 #include "ui/views/widget/widget_delegate.h" |
| 19 | 19 |
| 20 namespace mash { | 20 namespace mash { |
| 21 namespace system_ui { | 21 namespace system_ui { |
| 22 namespace { | 22 namespace { |
| 23 | 23 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 Shelf::Create(app->shell()); | 73 Shelf::Create(app->shell()); |
| 74 } | 74 } |
| 75 | 75 |
| 76 bool SystemUI::ConfigureIncomingConnection( | 76 bool SystemUI::ConfigureIncomingConnection( |
| 77 mojo::ApplicationConnection* connection) { | 77 mojo::ApplicationConnection* connection) { |
| 78 return true; | 78 return true; |
| 79 } | 79 } |
| 80 | 80 |
| 81 } // namespace system_ui | 81 } // namespace system_ui |
| 82 } // namespace mash | 82 } // namespace mash |
| OLD | NEW |