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

Side by Side Diff: components/view_manager/connection_manager.h

Issue 1166123005: Removes ServiceProviders from ViewManager::Embed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use is_headless rather than check for browser. Created 5 years, 6 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 | « components/html_viewer/setup.cc ('k') | components/view_manager/connection_manager.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 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 COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ 5 #ifndef COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ 6 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // Returns the id for the next ViewManagerServiceImpl. 82 // Returns the id for the next ViewManagerServiceImpl.
83 mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId(); 83 mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId();
84 84
85 // Invoked when a ViewManagerServiceImpl's connection encounters an error. 85 // Invoked when a ViewManagerServiceImpl's connection encounters an error.
86 void OnConnectionError(ClientConnection* connection); 86 void OnConnectionError(ClientConnection* connection);
87 87
88 // See description of ViewManagerService::Embed() for details. This assumes 88 // See description of ViewManagerService::Embed() for details. This assumes
89 // |transport_view_id| is valid. 89 // |transport_view_id| is valid.
90 void EmbedAtView(mojo::ConnectionSpecificId creator_id, 90 void EmbedAtView(mojo::ConnectionSpecificId creator_id,
91 mojo::URLRequestPtr request,
92 const ViewId& view_id, 91 const ViewId& view_id,
93 mojo::InterfaceRequest<mojo::ServiceProvider> services, 92 mojo::URLRequestPtr request);
94 mojo::ServiceProviderPtr exposed_services);
95 void EmbedAtView(mojo::ConnectionSpecificId creator_id, 93 void EmbedAtView(mojo::ConnectionSpecificId creator_id,
96 const ViewId& view_id, 94 const ViewId& view_id,
97 mojo::ViewManagerClientPtr client); 95 mojo::ViewManagerClientPtr client);
98 96
99 // Returns the connection by id. 97 // Returns the connection by id.
100 ViewManagerServiceImpl* GetConnection( 98 ViewManagerServiceImpl* GetConnection(
101 mojo::ConnectionSpecificId connection_id); 99 mojo::ConnectionSpecificId connection_id);
102 100
103 // Returns the View identified by |id|. 101 // Returns the View identified by |id|.
104 ServerView* GetView(const ViewId& id); 102 ServerView* GetView(const ViewId& id);
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 scoped_ptr<FocusController> focus_controller_; 272 scoped_ptr<FocusController> focus_controller_;
275 273
276 mojo::ViewManagerRootClientPtr view_manager_root_client_; 274 mojo::ViewManagerRootClientPtr view_manager_root_client_;
277 275
278 DISALLOW_COPY_AND_ASSIGN(ConnectionManager); 276 DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
279 }; 277 };
280 278
281 } // namespace view_manager 279 } // namespace view_manager
282 280
283 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_ 281 #endif // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
OLDNEW
« no previous file with comments | « components/html_viewer/setup.cc ('k') | components/view_manager/connection_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698