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

Side by Side Diff: services/window_manager/window_manager_app.h

Issue 943053003: Simple multi-url support for mojo apps (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: hate Created 5 years, 9 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_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ 5 #ifndef SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
6 #define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ 6 #define SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // WindowManagerImpl::Embed() forwards to this. If connected to ViewManager 93 // WindowManagerImpl::Embed() forwards to this. If connected to ViewManager
94 // then forwards to delegate, otherwise waits for connection to establish then 94 // then forwards to delegate, otherwise waits for connection to establish then
95 // forwards. 95 // forwards.
96 void Embed(const mojo::String& url, 96 void Embed(const mojo::String& url,
97 mojo::InterfaceRequest<mojo::ServiceProvider> services, 97 mojo::InterfaceRequest<mojo::ServiceProvider> services,
98 mojo::ServiceProviderPtr exposed_services); 98 mojo::ServiceProviderPtr exposed_services);
99 99
100 // Overridden from ApplicationDelegate: 100 // Overridden from ApplicationDelegate:
101 void Initialize(mojo::ApplicationImpl* impl) override; 101 void Initialize(mojo::ApplicationImpl* impl) override;
102 bool ConfigureIncomingConnection( 102 bool ConfigureIncomingConnection(
103 mojo::ApplicationConnection* connection) override; 103 mojo::ApplicationConnection* connection,
104 const std::string& url) override;
104 105
105 private: 106 private:
106 // TODO(sky): rename this. Connections is ambiguous. 107 // TODO(sky): rename this. Connections is ambiguous.
107 typedef std::set<WindowManagerImpl*> Connections; 108 typedef std::set<WindowManagerImpl*> Connections;
108 typedef std::set<mojo::Id> RegisteredViewIdSet; 109 typedef std::set<mojo::Id> RegisteredViewIdSet;
109 110
110 struct PendingEmbed; 111 struct PendingEmbed;
111 class WindowManagerInternalImpl; 112 class WindowManagerInternalImpl;
112 113
113 mojo::ViewManager* view_manager() { 114 mojo::ViewManager* view_manager() {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 scoped_ptr<ViewEventDispatcher> view_event_dispatcher_; 205 scoped_ptr<ViewEventDispatcher> view_event_dispatcher_;
205 206
206 scoped_ptr<mojo::Binding<WindowManagerInternal>> wm_internal_binding_; 207 scoped_ptr<mojo::Binding<WindowManagerInternal>> wm_internal_binding_;
207 208
208 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp); 209 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp);
209 }; 210 };
210 211
211 } // namespace window_manager 212 } // namespace window_manager
212 213
213 #endif // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ 214 #endif // SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698