| Index: mojo/services/view_manager/context_factory_impl.h
|
| diff --git a/mojo/aura/context_factory_mojo.h b/mojo/services/view_manager/context_factory_impl.h
|
| similarity index 73%
|
| rename from mojo/aura/context_factory_mojo.h
|
| rename to mojo/services/view_manager/context_factory_impl.h
|
| index 3eca7948809e9814daffdb1e9434b2532d182a51..30cd26754b81f8515dc78d6e65b1761e91e651fe 100644
|
| --- a/mojo/aura/context_factory_mojo.h
|
| +++ b/mojo/services/view_manager/context_factory_impl.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
|
| -#define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
|
| +#ifndef MOJO_SERVICES_VIEW_MANAGER_CONTEXT_FACTORY_IMPL_H_
|
| +#define MOJO_SERVICES_VIEW_MANAGER_CONTEXT_FACTORY_IMPL_H_
|
|
|
| #include "mojo/public/cpp/system/core.h"
|
| #include "ui/compositor/compositor.h"
|
| @@ -15,12 +15,14 @@ class ContextProviderInProcess;
|
| }
|
|
|
| namespace mojo {
|
| +namespace view_manager {
|
| +namespace service {
|
|
|
| // The default factory that creates in-process contexts.
|
| -class ContextFactoryMojo : public ui::ContextFactory {
|
| +class ContextFactoryImpl : public ui::ContextFactory {
|
| public:
|
| - explicit ContextFactoryMojo(ScopedMessagePipeHandle command_buffer_handle);
|
| - virtual ~ContextFactoryMojo();
|
| + explicit ContextFactoryImpl(ScopedMessagePipeHandle command_buffer_handle);
|
| + virtual ~ContextFactoryImpl();
|
|
|
| // ContextFactory implementation
|
| virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
|
| @@ -44,9 +46,11 @@ class ContextFactoryMojo : public ui::ContextFactory {
|
|
|
| ScopedMessagePipeHandle command_buffer_handle_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ContextFactoryMojo);
|
| + DISALLOW_COPY_AND_ASSIGN(ContextFactoryImpl);
|
| };
|
|
|
| +} // namespace service
|
| +} // namespace view_manager
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
|
| +#endif // MOJO_SERVICES_VIEW_MANAGER_CONTEXT_FACTORY_IMPL_H_
|
|
|