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

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

Issue 1213683004: Move //sky/compositor to //sky/viewer/compositor (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 5 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 | « sky/viewer/compositor/surface_allocator.cc ('k') | sky/viewer/compositor/surface_holder.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_VIEWER_COMPOSITOR_SURFACE_HOLDER_H_
6 #define SKY_COMPOSITOR_SURFACE_HOLDER_H_ 6 #define SKY_VIEWER_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 "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 class Shell; 16 class Shell;
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 mojo::SurfacePtr surface_; 52 mojo::SurfacePtr surface_;
53 mojo::Binding<mojo::ResourceReturner> returner_binding_; 53 mojo::Binding<mojo::ResourceReturner> returner_binding_;
54 54
55 base::WeakPtrFactory<SurfaceHolder> weak_factory_; 55 base::WeakPtrFactory<SurfaceHolder> weak_factory_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(SurfaceHolder); 57 DISALLOW_COPY_AND_ASSIGN(SurfaceHolder);
58 }; 58 };
59 59
60 } // namespace sky 60 } // namespace sky
61 61
62 #endif // SKY_COMPOSITOR_SURFACE_HOLDER_H_ 62 #endif // SKY_VIEWER_COMPOSITOR_SURFACE_HOLDER_H_
OLDNEW
« no previous file with comments | « sky/viewer/compositor/surface_allocator.cc ('k') | sky/viewer/compositor/surface_holder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698