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

Side by Side Diff: components/mus/public/cpp/output_surface.h

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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_MUS_PUBLIC_CPP_OUTPUT_SURFACE_H_ 5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_OUTPUT_SURFACE_H_
6 #define COMPONENTS_MUS_PUBLIC_CPP_OUTPUT_SURFACE_H_ 6 #define COMPONENTS_MUS_PUBLIC_CPP_OUTPUT_SURFACE_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "cc/output/output_surface.h" 9 #include "cc/output/output_surface.h"
10 #include "cc/surfaces/surface_id.h" 10 #include "cc/surfaces/surface_id.h"
11 #include "components/mus/public/cpp/window_surface.h" 11 #include "components/mus/public/cpp/window_surface.h"
12 #include "components/mus/public/cpp/window_surface_client.h" 12 #include "components/mus/public/cpp/window_surface_client.h"
13 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h" 13 #include "mojo/public/cpp/bindings/binding.h"
14 14
15 namespace mus { 15 namespace mus {
16 16
17 class OutputSurface : public cc::OutputSurface, public WindowSurfaceClient { 17 class OutputSurface : public cc::OutputSurface, public WindowSurfaceClient {
18 public: 18 public:
19 OutputSurface(const scoped_refptr<cc::ContextProvider>& context_provider, 19 OutputSurface(const scoped_refptr<cc::ContextProvider>& context_provider,
20 scoped_ptr<WindowSurface> surface); 20 scoped_ptr<WindowSurface> surface);
21 ~OutputSurface() override; 21 ~OutputSurface() override;
22 22
23 // cc::OutputSurface implementation. 23 // cc::OutputSurface implementation.
(...skipping 10 matching lines...) Expand all
34 void SwapBuffersComplete(); 34 void SwapBuffersComplete();
35 35
36 scoped_ptr<WindowSurface> surface_; 36 scoped_ptr<WindowSurface> surface_;
37 37
38 DISALLOW_COPY_AND_ASSIGN(OutputSurface); 38 DISALLOW_COPY_AND_ASSIGN(OutputSurface);
39 }; 39 };
40 40
41 } // namespace mus 41 } // namespace mus
42 42
43 #endif // COMPONENTS_MUS_PUBLIC_CPP_OUTPUT_SURFACE_H_ 43 #endif // COMPONENTS_MUS_PUBLIC_CPP_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « components/mus/public/cpp/lib/window_tree_client_impl.h ('k') | components/mus/public/cpp/property_type_converters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698