Index: components/mus/surfaces/top_level_display_client.cc |
diff --git a/components/mus/surfaces/top_level_display_client.cc b/components/mus/surfaces/top_level_display_client.cc |
index c6eeea7c5ada25e2f07327184a8e292f2bfa409c..5c780b869b982543438a808aaab5aa04b032534d 100644 |
--- a/components/mus/surfaces/top_level_display_client.cc |
+++ b/components/mus/surfaces/top_level_display_client.cc |
@@ -12,7 +12,7 @@ |
#include "components/mus/surfaces/surfaces_scheduler.h" |
#include "components/mus/surfaces/surfaces_state.h" |
-namespace surfaces { |
+namespace mus { |
namespace { |
void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) { |
callback.Run(); |
@@ -21,7 +21,7 @@ void CallCallback(const base::Closure& callback, cc::SurfaceDrawStatus status) { |
TopLevelDisplayClient::TopLevelDisplayClient( |
gfx::AcceleratedWidget widget, |
- const scoped_refptr<gles2::GpuState>& gpu_state, |
+ const scoped_refptr<GpuState>& gpu_state, |
const scoped_refptr<SurfacesState>& surfaces_state) |
: gpu_state_(gpu_state), |
surfaces_state_(surfaces_state), |
@@ -36,7 +36,7 @@ TopLevelDisplayClient::TopLevelDisplayClient( |
// TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676 |
cc::DisplayScheduler* null_display_scheduler = nullptr; |
display_->Initialize( |
- make_scoped_ptr(new surfaces::DirectOutputSurface( |
+ make_scoped_ptr(new DirectOutputSurface( |
new SurfacesContextProvider(this, widget, gpu_state))), |
null_display_scheduler); |
@@ -104,4 +104,4 @@ void TopLevelDisplayClient::ReturnResources( |
// TODO(fsamuel): Implement this. |
} |
-} // namespace surfaces |
+} // namespace mus |