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

Side by Side Diff: components/view_manager/public/cpp/view.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
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_PUBLIC_CPP_VIEW_H_ 5 #ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
6 #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_ 6 #define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 bool Contains(View* child) const; 122 bool Contains(View* child) const;
123 123
124 View* GetChildById(Id id); 124 View* GetChildById(Id id);
125 125
126 void SetSurfaceId(SurfaceIdPtr id); 126 void SetSurfaceId(SurfaceIdPtr id);
127 127
128 // Focus. 128 // Focus.
129 void SetFocus(); 129 void SetFocus();
130 130
131 // Embedding. See view_manager.mojom for details. 131 // Embedding. See view_manager.mojom for details.
132 void Embed(const String& url);
133 void Embed(mojo::URLRequestPtr request,
134 InterfaceRequest<ServiceProvider> services,
135 ServiceProviderPtr exposed_services);
136 void Embed(ViewManagerClientPtr client); 132 void Embed(ViewManagerClientPtr client);
137 void EmbedAllowingReembed(mojo::URLRequestPtr request); 133 void EmbedAllowingReembed(mojo::URLRequestPtr request);
138 134
139 protected: 135 protected:
140 // This class is subclassed only by test classes that provide a public ctor. 136 // This class is subclassed only by test classes that provide a public ctor.
141 View(); 137 View();
142 ~View(); 138 ~View();
143 139
144 private: 140 private:
145 friend class ViewPrivate; 141 friend class ViewPrivate;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 }; 207 };
212 208
213 std::map<const void*, Value> prop_map_; 209 std::map<const void*, Value> prop_map_;
214 210
215 MOJO_DISALLOW_COPY_AND_ASSIGN(View); 211 MOJO_DISALLOW_COPY_AND_ASSIGN(View);
216 }; 212 };
217 213
218 } // namespace mojo 214 } // namespace mojo
219 215
220 #endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_ 216 #endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
OLDNEW
« no previous file with comments | « components/view_manager/public/cpp/lib/view_manager_delegate.cc ('k') | components/view_manager/public/cpp/view_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698