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

Side by Side Diff: sky/compositor/surface_holder.h

Issue 882083003: Remove mojo.SurfacesService interface in favor of mojo.Surface directly (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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
« no previous file with comments | « services/view_manager/display_manager.h ('k') | sky/viewer/document_view.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 SKY_COMPOSITOR_SURFACE_HOLDER_H_ 5 #ifndef SKY_COMPOSITOR_SURFACE_HOLDER_H_
6 #define SKY_COMPOSITOR_SURFACE_HOLDER_H_ 6 #define SKY_COMPOSITOR_SURFACE_HOLDER_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h" 11 #include "mojo/services/surfaces/public/interfaces/surface_id.mojom.h"
12 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h" 12 #include "mojo/services/surfaces/public/interfaces/surfaces.mojom.h"
13 #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h"
14 #include "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.h"
15 14
16 namespace mojo { 15 namespace mojo {
17 class Shell; 16 class Shell;
18 } 17 }
19 18
20 namespace sky { 19 namespace sky {
21 class SurfaceAllocator; 20 class SurfaceAllocator;
22 21
23 class SurfaceHolder : public mojo::SurfaceClient { 22 class SurfaceHolder : public mojo::SurfaceClient {
(...skipping 29 matching lines...) Expand all
53 mojo::SurfacePtr surface_; 52 mojo::SurfacePtr surface_;
54 53
55 base::WeakPtrFactory<SurfaceHolder> weak_factory_; 54 base::WeakPtrFactory<SurfaceHolder> weak_factory_;
56 55
57 DISALLOW_COPY_AND_ASSIGN(SurfaceHolder); 56 DISALLOW_COPY_AND_ASSIGN(SurfaceHolder);
58 }; 57 };
59 58
60 } // namespace sky 59 } // namespace sky
61 60
62 #endif // SKY_COMPOSITOR_SURFACE_HOLDER_H_ 61 #endif // SKY_COMPOSITOR_SURFACE_HOLDER_H_
OLDNEW
« no previous file with comments | « services/view_manager/display_manager.h ('k') | sky/viewer/document_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698