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

Side by Side Diff: mojo/services/view_manager/public/cpp/view.h

Issue 905083002: Adds Embed() variant to ViewManagerService that takes ViewManagerClient (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: real comments 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 MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 bool Contains(View* child) const; 116 bool Contains(View* child) const;
117 117
118 View* GetChildById(Id id); 118 View* GetChildById(Id id);
119 119
120 void SetSurfaceId(SurfaceIdPtr id); 120 void SetSurfaceId(SurfaceIdPtr id);
121 121
122 // Focus. 122 // Focus.
123 void SetFocus(); 123 void SetFocus();
124 124
125 // Embedding. 125 // Embedding. See view_manager.mojom for details.
126 void Embed(const String& url); 126 void Embed(const String& url);
127 void Embed(const String& url, 127 void Embed(const String& url,
128 InterfaceRequest<ServiceProvider> services, 128 InterfaceRequest<ServiceProvider> services,
129 ServiceProviderPtr exposed_services); 129 ServiceProviderPtr exposed_services);
130 void Embed(ViewManagerClientPtr client);
130 131
131 protected: 132 protected:
132 // This class is subclassed only by test classes that provide a public ctor. 133 // This class is subclassed only by test classes that provide a public ctor.
133 View(); 134 View();
134 ~View(); 135 ~View();
135 136
136 private: 137 private:
137 friend class ViewPrivate; 138 friend class ViewPrivate;
138 friend class ViewManagerClientImpl; 139 friend class ViewManagerClientImpl;
139 140
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 }; 198 };
198 199
199 std::map<const void*, Value> prop_map_; 200 std::map<const void*, Value> prop_map_;
200 201
201 DISALLOW_COPY_AND_ASSIGN(View); 202 DISALLOW_COPY_AND_ASSIGN(View);
202 }; 203 };
203 204
204 } // namespace mojo 205 } // namespace mojo
205 206
206 #endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_ 207 #endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698