Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Side by Side Diff: mash/task_viewer/task_viewer.cc

Issue 1877753003: Move mojo\shell to services\shell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@62scan
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « mash/task_viewer/task_viewer.h ('k') | mash/wm/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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.h" 5 #include "mash/task_viewer/task_viewer.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/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/process/process.h" 14 #include "base/process/process.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "mojo/public/cpp/bindings/binding.h" 17 #include "mojo/public/cpp/bindings/binding.h"
18 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h" 18 #include "mojo/services/catalog/public/interfaces/catalog.mojom.h"
19 #include "mojo/shell/public/cpp/connection.h" 19 #include "services/shell/public/cpp/connection.h"
20 #include "mojo/shell/public/cpp/connector.h" 20 #include "services/shell/public/cpp/connector.h"
21 #include "mojo/shell/public/interfaces/shell.mojom.h" 21 #include "services/shell/public/interfaces/shell.mojom.h"
22 #include "ui/base/models/table_model.h" 22 #include "ui/base/models/table_model.h"
23 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/resources/grit/ui_resources.h" 24 #include "ui/resources/grit/ui_resources.h"
25 #include "ui/views/background.h" 25 #include "ui/views/background.h"
26 #include "ui/views/controls/button/label_button.h" 26 #include "ui/views/controls/button/label_button.h"
27 #include "ui/views/controls/table/table_view.h" 27 #include "ui/views/controls/table/table_view.h"
28 #include "ui/views/controls/table/table_view_observer.h" 28 #include "ui/views/controls/table/table_view_observer.h"
29 #include "ui/views/mus/aura_init.h" 29 #include "ui/views/mus/aura_init.h"
30 #include "ui/views/mus/window_manager_connection.h" 30 #include "ui/views/mus/window_manager_connection.h"
31 #include "ui/views/widget/widget_delegate.h" 31 #include "ui/views/widget/widget_delegate.h"
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 291
292 TaskViewerContents* task_viewer = new TaskViewerContents( 292 TaskViewerContents* task_viewer = new TaskViewerContents(
293 std::move(request), std::move(catalog)); 293 std::move(request), std::move(catalog));
294 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds( 294 views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
295 task_viewer, nullptr, gfx::Rect(10, 10, 500, 500)); 295 task_viewer, nullptr, gfx::Rect(10, 10, 500, 500));
296 window->Show(); 296 window->Show();
297 } 297 }
298 298
299 } // namespace task_viewer 299 } // namespace task_viewer
300 } // namespace main 300 } // namespace main
OLDNEW
« no previous file with comments | « mash/task_viewer/task_viewer.h ('k') | mash/wm/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698