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

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

Issue 791493006: De-client tracing.TraceController interface (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: hook mojo shell up again 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
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/common/tracing_impl.h"
8 #include "mojo/public/c/system/main.h" 8 #include "mojo/public/c/system/main.h"
9 #include "mojo/public/cpp/application/application_delegate.h" 9 #include "mojo/public/cpp/application/application_delegate.h"
10 #include "mojo/public/cpp/application/service_provider_impl.h" 10 #include "mojo/public/cpp/application/service_provider_impl.h"
(...skipping 18 matching lines...) Expand all
29 DefaultWindowManager() 29 DefaultWindowManager()
30 : window_manager_app_(new WindowManagerApp(this, this)), 30 : window_manager_app_(new WindowManagerApp(this, this)),
31 view_manager_(NULL), 31 view_manager_(NULL),
32 root_(NULL) {} 32 root_(NULL) {}
33 ~DefaultWindowManager() override {} 33 ~DefaultWindowManager() override {}
34 34
35 private: 35 private:
36 // Overridden from mojo::ApplicationDelegate: 36 // Overridden from mojo::ApplicationDelegate:
37 void Initialize(mojo::ApplicationImpl* impl) override { 37 void Initialize(mojo::ApplicationImpl* impl) override {
38 window_manager_app_->Initialize(impl); 38 window_manager_app_->Initialize(impl);
39 mojo::TracingImpl::Create(impl); 39 tracing_.Initialize(impl);
40 } 40 }
41 bool ConfigureIncomingConnection( 41 bool ConfigureIncomingConnection(
42 mojo::ApplicationConnection* connection) override { 42 mojo::ApplicationConnection* connection) override {
43 window_manager_app_->ConfigureIncomingConnection(connection); 43 window_manager_app_->ConfigureIncomingConnection(connection);
44 return true; 44 return true;
45 } 45 }
46 46
47 // Overridden from ViewManagerDelegate: 47 // Overridden from ViewManagerDelegate:
48 void OnEmbed(ViewManager* view_manager, 48 void OnEmbed(ViewManager* view_manager,
49 View* root, 49 View* root,
(...skipping 12 matching lines...) Expand all
62 root_->AddChild(view); 62 root_->AddChild(view);
63 view->SetVisible(true); 63 view->SetVisible(true);
64 view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>( 64 view->Embed(url, scoped_ptr<mojo::ServiceProviderImpl>(
65 new mojo::ServiceProviderImpl).Pass()); 65 new mojo::ServiceProviderImpl).Pass());
66 } 66 }
67 67
68 scoped_ptr<WindowManagerApp> window_manager_app_; 68 scoped_ptr<WindowManagerApp> window_manager_app_;
69 69
70 ViewManager* view_manager_; 70 ViewManager* view_manager_;
71 View* root_; 71 View* root_;
72 mojo::TracingImpl tracing_;
72 73
73 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager); 74 MOJO_DISALLOW_COPY_AND_ASSIGN(DefaultWindowManager);
74 }; 75 };
75 76
76 } // namespace window_manager 77 } // namespace window_manager
77 78
78 MojoResult MojoMain(MojoHandle shell_handle) { 79 MojoResult MojoMain(MojoHandle shell_handle) {
79 mojo::ApplicationRunnerChromium runner( 80 mojo::ApplicationRunnerChromium runner(
80 new window_manager::DefaultWindowManager); 81 new window_manager::DefaultWindowManager);
81 return runner.Run(shell_handle); 82 return runner.Run(shell_handle);
82 } 83 }
OLDNEW
« no previous file with comments | « services/view_manager/view_manager_app.cc ('k') | shell/context.h » ('j') | shell/context.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698