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/task_viewer/task_viewer_application_delegate.h" | 5 #include "mash/task_viewer/task_viewer_application_delegate.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/process/process.h" | 12 #include "base/process/process.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
14 #include "base/strings/utf_string_conversions.h" | 14 #include "base/strings/utf_string_conversions.h" |
15 #include "mojo/application/public/cpp/application_connection.h" | |
16 #include "mojo/application/public/cpp/application_impl.h" | |
17 #include "mojo/application/public/interfaces/application_manager.mojom.h" | |
18 #include "mojo/public/cpp/bindings/binding.h" | 15 #include "mojo/public/cpp/bindings/binding.h" |
| 16 #include "mojo/shell/public/cpp/application_connection.h" |
| 17 #include "mojo/shell/public/cpp/application_impl.h" |
| 18 #include "mojo/shell/public/interfaces/application_manager.mojom.h" |
19 #include "ui/base/models/table_model.h" | 19 #include "ui/base/models/table_model.h" |
20 #include "ui/views/background.h" | 20 #include "ui/views/background.h" |
21 #include "ui/views/controls/button/label_button.h" | 21 #include "ui/views/controls/button/label_button.h" |
22 #include "ui/views/controls/table/table_view.h" | 22 #include "ui/views/controls/table/table_view.h" |
23 #include "ui/views/controls/table/table_view_observer.h" | 23 #include "ui/views/controls/table/table_view_observer.h" |
24 #include "ui/views/mus/aura_init.h" | 24 #include "ui/views/mus/aura_init.h" |
25 #include "ui/views/mus/window_manager_connection.h" | 25 #include "ui/views/mus/window_manager_connection.h" |
26 #include "ui/views/widget/widget_delegate.h" | 26 #include "ui/views/widget/widget_delegate.h" |
27 | 27 |
28 namespace mash { | 28 namespace mash { |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 application_manager->AddListener(std::move(listener)); | 230 application_manager->AddListener(std::move(listener)); |
231 | 231 |
232 TaskViewer* task_viewer = new TaskViewer(std::move(request)); | 232 TaskViewer* task_viewer = new TaskViewer(std::move(request)); |
233 views::Widget* window = views::Widget::CreateWindowWithBounds( | 233 views::Widget* window = views::Widget::CreateWindowWithBounds( |
234 task_viewer, gfx::Rect(10, 10, 500, 500)); | 234 task_viewer, gfx::Rect(10, 10, 500, 500)); |
235 window->Show(); | 235 window->Show(); |
236 } | 236 } |
237 | 237 |
238 } // namespace task_viewer | 238 } // namespace task_viewer |
239 } // namespace main | 239 } // namespace main |
OLD | NEW |