components/mus/public/cpp/window_surface.h - Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: components/mus/public/cpp/window_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

« no previous file with comments | « components/mus/public/cpp/window.h ('k') | components/mus/public/cpp/window_tracker.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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_WINDOW_SURFACE_H_	5 #ifndef COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_

6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_	6 #define COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "base/observer_list.h"	9 #include "base/observer_list.h"

10 #include "components/mus/public/interfaces/compositor_frame.mojom.h"	10 #include "components/mus/public/interfaces/compositor_frame.mojom.h"

11 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"	11 #include "mojo/public/cpp/bindings/binding.h"

12 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_ptr_info.h"	12 #include "mojo/public/cpp/bindings/interface_ptr_info.h"

13	13

14 namespace mus {	14 namespace mus {

15	15

16 class WindowSurfaceClient;	16 class WindowSurfaceClient;

17 class Window;	17 class Window;

18	18

19 // A WindowSurface is wrapper to simplify submitting CompositorFrames to Views,	19 // A WindowSurface is wrapper to simplify submitting CompositorFrames to Views,

20 // and receiving ReturnedResources.	20 // and receiving ReturnedResources.

21 class WindowSurface : public mojom::SurfaceClient {	21 class WindowSurface : public mojom::SurfaceClient {

22 public:	22 public:

(...skipping 22 matching lines...) Expand all Loading...
45 mojo::InterfacePtrInfo<mojom::Surface> surface_info_;	45 mojo::InterfacePtrInfo<mojom::Surface> surface_info_;

46 mojo::InterfaceRequest<mojom::SurfaceClient> client_request_;	46 mojo::InterfaceRequest<mojom::SurfaceClient> client_request_;

47 mojom::SurfacePtr surface_;	47 mojom::SurfacePtr surface_;

48 scoped_ptr<mojo::Binding<mojom::SurfaceClient>> client_binding_;	48 scoped_ptr<mojo::Binding<mojom::SurfaceClient>> client_binding_;

49 bool bound_to_thread_;	49 bool bound_to_thread_;

50 };	50 };

51	51

52 } // namespace mus	52 } // namespace mus

53	53

54 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_	54 #endif // COMPONENTS_MUS_PUBLIC_CPP_WINDOW_SURFACE_H_

OLD	NEW