Index: mojo/edk/system/configuration.h |
diff --git a/third_party/mojo/src/mojo/edk/system/configuration.h b/mojo/edk/system/configuration.h |
similarity index 66% |
copy from third_party/mojo/src/mojo/edk/system/configuration.h |
copy to mojo/edk/system/configuration.h |
index 007277ade94fbdcd3ae6483033fd6adf222a27d3..038835ffdd9e8003581c6b17d4afb0772de6bb35 100644 |
--- a/third_party/mojo/src/mojo/edk/system/configuration.h |
+++ b/mojo/edk/system/configuration.h |
@@ -9,23 +9,21 @@ |
#include "mojo/edk/system/system_impl_export.h" |
namespace mojo { |
-namespace system { |
+namespace edk { |
namespace internal { |
-MOJO_SYSTEM_IMPL_EXPORT extern embedder::Configuration g_configuration; |
+MOJO_SYSTEM_IMPL_EXPORT extern Configuration g_configuration; |
} // namespace internal |
-MOJO_SYSTEM_IMPL_EXPORT inline const embedder::Configuration& |
-GetConfiguration() { |
+MOJO_SYSTEM_IMPL_EXPORT inline const Configuration& GetConfiguration() { |
return internal::g_configuration; |
} |
-MOJO_SYSTEM_IMPL_EXPORT inline embedder::Configuration* |
-GetMutableConfiguration() { |
+MOJO_SYSTEM_IMPL_EXPORT inline Configuration* GetMutableConfiguration() { |
return &internal::g_configuration; |
} |
-} // namespace system |
+} // namespace edk |
} // namespace mojo |
#endif // MOJO_EDK_SYSTEM_CONFIGURATION_H_ |