diff --git a/src/core/surface_factory_qt.cpp b/src/core/surface_factory_qt.cpp index 86a6a92d41ae0569aeb32bd1f6991ae3439fb7c6..d5cb78f29f9173460bf39368ca0da8ebef2559f9 100644 --- a/src/core/surface_factory_qt.cpp +++ b/src/core/surface_factory_qt.cpp @@ -55,7 +55,7 @@ #define QT_LIBDIR_GLES2 QT_LIBDIR_EGL #endif -namespace QtWebEngine { +namespace QtWebEngineCore { base::NativeLibrary LoadLibrary(const base::FilePath& filename) { base::NativeLibraryLoadError error; diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h index ea906e64f5577456b09a7608099602e39bdc8aab..7d6f0435e992c51d760ebafc4bde2c0ec575836a 100644 --- a/src/core/surface_factory_qt.h +++ b/src/core/surface_factory_qt.h @@ -43,7 +43,7 @@ #include <QtGlobal> -namespace QtWebEngine { +namespace QtWebEngineCore { class SurfaceFactoryQt : public ui::SurfaceFactoryOzone diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h index dbd8f2476d31aae2247b0d500677757a4026302d..5f45aad988c743b65f23b1f5c8b8cda7e6c4da01 100644 --- a/src/core/web_engine_context.h +++ b/src/core/web_engine_context.h @@ -75,7 +75,7 @@ private: scoped_ptr<content::ContentMainRunner> m_contentRunner; scoped_ptr<content::BrowserMainRunner> m_browserRunner; #if defined(OS_ANDROID) - scoped_ptr<QtWebEngine::SurfaceFactoryQt> m_surfaceFactory; + scoped_ptr<QtWebEngineCore::SurfaceFactoryQt> m_surfaceFactory; #endif QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_defaultBrowserContext; QExplicitlySharedDataPointer<QtWebEngineCore::BrowserContextAdapter> m_offTheRecordBrowserContext;