| Index: ui/views/mus/surface_context_factory.cc
|
| diff --git a/mandoline/ui/aura/surface_context_factory.cc b/ui/views/mus/surface_context_factory.cc
|
| similarity index 94%
|
| rename from mandoline/ui/aura/surface_context_factory.cc
|
| rename to ui/views/mus/surface_context_factory.cc
|
| index 0a75487128a093141062fc27d4c413529adbe74c..e6c8b52daf517907ae88521584e9317ffb0c7d11 100644
|
| --- a/mandoline/ui/aura/surface_context_factory.cc
|
| +++ b/ui/views/mus/surface_context_factory.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mandoline/ui/aura/surface_context_factory.h"
|
| +#include "ui/views/mus/surface_context_factory.h"
|
|
|
| #include "cc/output/output_surface.h"
|
| #include "cc/resources/shared_bitmap_manager.h"
|
| @@ -12,7 +12,7 @@
|
| #include "ui/compositor/reflector.h"
|
| #include "ui/gl/gl_bindings.h"
|
|
|
| -namespace mandoline {
|
| +namespace views {
|
| namespace {
|
|
|
| class FakeReflector : public ui::Reflector {
|
| @@ -23,15 +23,13 @@ class FakeReflector : public ui::Reflector {
|
| void AddMirroringLayer(ui::Layer* layer) override {}
|
| void RemoveMirroringLayer(ui::Layer* layer) override {}
|
| };
|
| -
|
| }
|
|
|
| SurfaceContextFactory::SurfaceContextFactory(mojo::Shell* shell,
|
| mus::View* view)
|
| : surface_binding_(shell, view), next_surface_id_namespace_(1u) {}
|
|
|
| -SurfaceContextFactory::~SurfaceContextFactory() {
|
| -}
|
| +SurfaceContextFactory::~SurfaceContextFactory() {}
|
|
|
| void SurfaceContextFactory::CreateOutputSurface(
|
| base::WeakPtr<ui::Compositor> compositor) {
|
| @@ -95,4 +93,4 @@ void SurfaceContextFactory::ResizeDisplay(ui::Compositor* compositor,
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -} // namespace mandoline
|
| +} // namespace views
|
|
|