1 files changed, 27 insertions, 13 deletions
diff --git a/chromium/ui/gl/init/BUILD.gn b/chromium/ui/gl/init/BUILD.gn
index 72a840d78fa..9141ba379fd 100644
--- a/chromium/ui/gl/init/BUILD.gn
+++ b/chromium/ui/gl/init/BUILD.gn
@@ -56,12 +56,36 @@ jumbo_component("init") {
     ]
 
     libs = [ "OpenGL.framework" ]
-  } else if (use_x11) {
+  } else if (use_ozone) {
+    sources += [
+      "gl_display_egl_util_ozone.cc",
+      "gl_display_egl_util_ozone.h",
+      "ozone_util.h",
+    ]
+    deps += [ "//ui/ozone" ]
+  }
+
+  # Allow X11 to use Ozone implementation of gl_factory and gl_initializer.
+  # This is needed temporarily to allow use_x11 && use_ozone build. Once
+  # use_x11 goes away, this will be removed.  Internally, it checks whether
+  # it should use pure X11 implementation or Ozone implementation based on
+  # IsUsingOzonePlatform feature flag.
+  if (use_x11 || use_ozone) {
+    sources += [
+      "gl_factory_ozone.cc",
+      "gl_initializer_ozone.cc",
+    ]
+    deps += [ "//ui/base:features" ]
+  }
+
+  if (use_x11) {
     sources += [
       "gl_display_egl_util_x11.cc",
       "gl_display_egl_util_x11.h",
-      "gl_factory_x11.cc",
-      "gl_initializer_x11.cc",
+      "gl_factory_linux_x11.cc",
+      "gl_factory_linux_x11.h",
+      "gl_initializer_linux_x11.cc",
+      "gl_initializer_linux_x11.h",
     ]
 
     deps += [
@@ -69,15 +93,5 @@ jumbo_component("init") {
       "//ui/base/x:gl",
       "//ui/gfx/x",
     ]
-  } else if (use_ozone) {
-    sources += [
-      "gl_display_egl_util_ozone.cc",
-      "gl_display_egl_util_ozone.h",
-      "gl_factory_ozone.cc",
-      "gl_initializer_ozone.cc",
-      "ozone_util.h",
-    ]
-
-    deps += [ "//ui/ozone" ]
   }
 }