| Index: content/browser/compositor/browser_compositor_output_surface.h
|
| diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/compositor/browser_compositor_output_surface.h
|
| index 8c8f56cac0d11ffea21a8139a87c82c69e2c536f..f7c6f82fbe415d7ab6d3977ebfd8a59d07f5e987 100644
|
| --- a/content/browser/compositor/browser_compositor_output_surface.h
|
| +++ b/content/browser/compositor/browser_compositor_output_surface.h
|
| @@ -15,7 +15,7 @@ namespace cc {
|
| class SoftwareOutputDevice;
|
| }
|
|
|
| -namespace display_compositor {
|
| +namespace viz {
|
| class CompositorOverlayCandidateValidator;
|
| }
|
|
|
| @@ -53,7 +53,7 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
|
| BrowserCompositorOutputSurface(
|
| scoped_refptr<cc::ContextProvider> context,
|
| const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
|
| - std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
|
| + std::unique_ptr<viz::CompositorOverlayCandidateValidator>
|
| overlay_candidate_validator);
|
|
|
| // Constructor used by the software implementation.
|
| @@ -70,7 +70,7 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
|
| ReflectorImpl* reflector_;
|
|
|
| private:
|
| - std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
|
| + std::unique_ptr<viz::CompositorOverlayCandidateValidator>
|
| overlay_candidate_validator_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface);
|
|
|