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

Side by Side Diff: services/view_manager/view_manager_app.h

Issue 791493006: De-client tracing.TraceController interface (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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
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 #ifndef SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 5 #ifndef SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_
6 #define SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 6 #define SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "mojo/common/tracing_impl.h"
9 #include "mojo/public/cpp/application/application_delegate.h" 10 #include "mojo/public/cpp/application/application_delegate.h"
10 #include "mojo/public/cpp/application/interface_factory.h" 11 #include "mojo/public/cpp/application/interface_factory.h"
11 #include "mojo/public/cpp/bindings/binding.h" 12 #include "mojo/public/cpp/bindings/binding.h"
12 #include "mojo/public/cpp/bindings/error_handler.h" 13 #include "mojo/public/cpp/bindings/error_handler.h"
13 #include "mojo/services/window_manager/public/interfaces/window_manager_internal .mojom.h" 14 #include "mojo/services/window_manager/public/interfaces/window_manager_internal .mojom.h"
14 #include "services/view_manager/connection_manager_delegate.h" 15 #include "services/view_manager/connection_manager_delegate.h"
15 16
16 namespace view_manager { 17 namespace view_manager {
17 18
18 class ConnectionManager; 19 class ConnectionManager;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 override; 54 override;
54 55
55 // ErrorHandler (for |wm_internal_| and |wm_internal_client_binding_|). 56 // ErrorHandler (for |wm_internal_| and |wm_internal_client_binding_|).
56 void OnConnectionError() override; 57 void OnConnectionError() override;
57 58
58 mojo::ApplicationConnection* wm_app_connection_; 59 mojo::ApplicationConnection* wm_app_connection_;
59 scoped_ptr<mojo::Binding<mojo::WindowManagerInternalClient>> 60 scoped_ptr<mojo::Binding<mojo::WindowManagerInternalClient>>
60 wm_internal_client_binding_; 61 wm_internal_client_binding_;
61 mojo::WindowManagerInternalPtr wm_internal_; 62 mojo::WindowManagerInternalPtr wm_internal_;
62 scoped_ptr<ConnectionManager> connection_manager_; 63 scoped_ptr<ConnectionManager> connection_manager_;
64 mojo::TracingImpl tracing_;
63 65
64 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); 66 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
65 }; 67 };
66 68
67 } // namespace view_manager 69 } // namespace view_manager
68 70
69 #endif // SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 71 #endif // SERVICES_VIEW_MANAGER_VIEW_MANAGER_APP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698