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

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

Issue 1975993002: Change InterfaceFactory<I>::Create() to take a ConnectionContext instead of an ApplicationConnectio… (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 7 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 | « services/ui/launcher/launcher_app.cc ('k') | services/ui/view_manager/view_manager_app.cc » ('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 #ifndef SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 5 #ifndef SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_
6 #define SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 6 #define SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 13 matching lines...) Expand all
24 ViewManagerApp(); 24 ViewManagerApp();
25 ~ViewManagerApp() override; 25 ~ViewManagerApp() override;
26 26
27 private: 27 private:
28 // |ApplicationDelegate|: 28 // |ApplicationDelegate|:
29 void Initialize(mojo::ApplicationImpl* app_impl) override; 29 void Initialize(mojo::ApplicationImpl* app_impl) override;
30 bool ConfigureIncomingConnection( 30 bool ConfigureIncomingConnection(
31 mojo::ApplicationConnection* connection) override; 31 mojo::ApplicationConnection* connection) override;
32 32
33 // |InterfaceFactory<ViewManager>|: 33 // |InterfaceFactory<ViewManager>|:
34 void Create(mojo::ApplicationConnection* connection, 34 void Create(const mojo::ConnectionContext& connection_context,
35 mojo::InterfaceRequest<mojo::ui::ViewManager> request) override; 35 mojo::InterfaceRequest<mojo::ui::ViewManager> request) override;
36 36
37 void OnCompositorConnectionError(); 37 void OnCompositorConnectionError();
38 void OnAssociateConnectionError(const std::string& url); 38 void OnAssociateConnectionError(const std::string& url);
39 39
40 void Shutdown(); 40 void Shutdown();
41 41
42 mojo::ApplicationImpl* app_impl_; 42 mojo::ApplicationImpl* app_impl_;
43 mojo::TracingImpl tracing_; 43 mojo::TracingImpl tracing_;
44 44
45 mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers_; 45 mojo::StrongBindingSet<mojo::ui::ViewManager> view_managers_;
46 std::unique_ptr<ViewRegistry> registry_; 46 std::unique_ptr<ViewRegistry> registry_;
47 47
48 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp); 48 DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
49 }; 49 };
50 50
51 } // namespace view_manager 51 } // namespace view_manager
52 52
53 #endif // SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_ 53 #endif // SERVICES_UI_VIEW_MANAGER_VIEW_MANAGER_APP_H_
OLDNEW
« no previous file with comments | « services/ui/launcher/launcher_app.cc ('k') | services/ui/view_manager/view_manager_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698