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

Side by Side Diff: mojo/services/view_manager/view_manager_service_impl.h

Issue 534843002: Convert view manager to surfaces with uploading shim in client lib (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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_VIEW_MANAGER_SERVICE_IMPL_H_ 5 #ifndef MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 6 #define MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/containers/hash_tables.h" 14 #include "base/containers/hash_tables.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
16 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" 17 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
17 #include "mojo/services/view_manager/access_policy_delegate.h" 18 #include "mojo/services/view_manager/access_policy_delegate.h"
18 #include "mojo/services/view_manager/ids.h" 19 #include "mojo/services/view_manager/ids.h"
19 #include "mojo/services/view_manager/view_manager_export.h" 20 #include "mojo/services/view_manager/view_manager_export.h"
20 21
21 namespace gfx { 22 namespace gfx {
22 class Rect; 23 class Rect;
23 } 24 }
24 25
25 namespace mojo { 26 namespace mojo {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 virtual void RemoveViewFromParent( 153 virtual void RemoveViewFromParent(
153 Id view_id, 154 Id view_id,
154 const Callback<void(bool)>& callback) OVERRIDE; 155 const Callback<void(bool)>& callback) OVERRIDE;
155 virtual void ReorderView(Id view_id, 156 virtual void ReorderView(Id view_id,
156 Id relative_view_id, 157 Id relative_view_id,
157 OrderDirection direction, 158 OrderDirection direction,
158 const Callback<void(bool)>& callback) OVERRIDE; 159 const Callback<void(bool)>& callback) OVERRIDE;
159 virtual void GetViewTree( 160 virtual void GetViewTree(
160 Id view_id, 161 Id view_id,
161 const Callback<void(Array<ViewDataPtr>)>& callback) OVERRIDE; 162 const Callback<void(Array<ViewDataPtr>)>& callback) OVERRIDE;
162 virtual void SetViewContents(Id view_id, 163 virtual void SetViewSurfaceId(Id view_id,
163 ScopedSharedBufferHandle buffer, 164 SurfaceIdPtr surface_id,
164 uint32_t buffer_size, 165 const Callback<void(bool)>& callback) OVERRIDE;
165 const Callback<void(bool)>& callback) OVERRIDE;
166 virtual void SetViewBounds(Id view_id, 166 virtual void SetViewBounds(Id view_id,
167 RectPtr bounds, 167 RectPtr bounds,
168 const Callback<void(bool)>& callback) OVERRIDE; 168 const Callback<void(bool)>& callback) OVERRIDE;
169 virtual void SetViewVisibility(Id view_id, 169 virtual void SetViewVisibility(Id view_id,
170 bool visible, 170 bool visible,
171 const Callback<void(bool)>& callback) OVERRIDE; 171 const Callback<void(bool)>& callback) OVERRIDE;
172 virtual void Embed(const String& url, 172 virtual void Embed(const String& url,
173 Id view_id, 173 Id view_id,
174 ServiceProviderPtr service_provider, 174 ServiceProviderPtr service_provider,
175 const Callback<void(bool)>& callback) OVERRIDE; 175 const Callback<void(bool)>& callback) OVERRIDE;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 }; 226 };
227 227
228 #if defined(OS_WIN) 228 #if defined(OS_WIN)
229 #pragma warning(pop) 229 #pragma warning(pop)
230 #endif 230 #endif
231 231
232 } // namespace service 232 } // namespace service
233 } // namespace mojo 233 } // namespace mojo
234 234
235 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_ 235 #endif // MOJO_SERVICES_VIEW_MANAGER_VIEW_MANAGER_SERVICE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698