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

Side by Side Diff: mojo/services/window_manager/main.cc

Issue 769963004: Add tracing service and make the shell+sky_viewer+services talk to it (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 | « mojo/services/window_manager/BUILD.gn ('k') | mojo/shell/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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "mojo/application/application_runner_chromium.h" 6 #include "mojo/application/application_runner_chromium.h"
7 #include "mojo/common/tracing_impl.h"
7 #include "mojo/public/c/system/main.h" 8 #include "mojo/public/c/system/main.h"
8 #include "mojo/public/cpp/application/application_delegate.h" 9 #include "mojo/public/cpp/application/application_delegate.h"
9 #include "mojo/public/cpp/application/service_provider_impl.h" 10 #include "mojo/public/cpp/application/service_provider_impl.h"
10 #include "mojo/services/public/cpp/view_manager/view_manager.h" 11 #include "mojo/services/public/cpp/view_manager/view_manager.h"
11 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" 12 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
12 #include "mojo/services/window_manager/window_manager_app.h" 13 #include "mojo/services/window_manager/window_manager_app.h"
13 #include "mojo/services/window_manager/window_manager_delegate.h" 14 #include "mojo/services/window_manager/window_manager_delegate.h"
14 15
15 // ApplicationDelegate implementation file for WindowManager users (e.g. 16 // ApplicationDelegate implementation file for WindowManager users (e.g.
16 // core window manager tests) that do not want to provide their own 17 // core window manager tests) that do not want to provide their own
17 // ApplicationDelegate::Create(). 18 // ApplicationDelegate::Create().
18 19
19 namespace mojo { 20 namespace mojo {
20 21
21 class DefaultWindowManager : public ApplicationDelegate, 22 class DefaultWindowManager : public ApplicationDelegate,
22 public ViewManagerDelegate, 23 public ViewManagerDelegate,
23 public WindowManagerDelegate { 24 public WindowManagerDelegate {
24 public: 25 public:
25 DefaultWindowManager() 26 DefaultWindowManager()
26 : window_manager_app_(new WindowManagerApp(this, this)), 27 : window_manager_app_(new WindowManagerApp(this, this)),
27 view_manager_(NULL), 28 view_manager_(NULL),
28 root_(NULL) {} 29 root_(NULL) {}
29 ~DefaultWindowManager() override {} 30 ~DefaultWindowManager() override {}
30 31
31 private: 32 private:
32 // Overridden from ApplicationDelegate: 33 // Overridden from ApplicationDelegate:
33 void Initialize(ApplicationImpl* impl) override { 34 void Initialize(ApplicationImpl* impl) override {
34 window_manager_app_->Initialize(impl); 35 window_manager_app_->Initialize(impl);
36 TracingImpl::Create(impl);
35 } 37 }
36 bool ConfigureIncomingConnection(ApplicationConnection* connection) override { 38 bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
37 window_manager_app_->ConfigureIncomingConnection(connection); 39 window_manager_app_->ConfigureIncomingConnection(connection);
38 return true; 40 return true;
39 } 41 }
40 42
41 // Overridden from ViewManagerDelegate: 43 // Overridden from ViewManagerDelegate:
42 void OnEmbed(ViewManager* view_manager, 44 void OnEmbed(ViewManager* view_manager,
43 View* root, 45 View* root,
44 ServiceProviderImpl* exported_services, 46 ServiceProviderImpl* exported_services,
(...skipping 20 matching lines...) Expand all
65 67
66 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); 68 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
67 }; 69 };
68 70
69 } // namespace mojo 71 } // namespace mojo
70 72
71 MojoResult MojoMain(MojoHandle shell_handle) { 73 MojoResult MojoMain(MojoHandle shell_handle) {
72 mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager); 74 mojo::ApplicationRunnerChromium runner(new mojo::DefaultWindowManager);
73 return runner.Run(shell_handle); 75 return runner.Run(shell_handle);
74 } 76 }
OLDNEW
« no previous file with comments | « mojo/services/window_manager/BUILD.gn ('k') | mojo/shell/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698