Move client_native_pixmap_factory.h from ui/ozone/public to ui/gfx

ui/ozone/public/client_native_pixmap_factory.cc

Index: ui/ozone/public/client_native_pixmap_factory.cc
diff --git a/ui/ozone/public/client_native_pixmap_factory.cc b/ui/ozone/public/client_native_pixmap_factory.cc
index 0db394ac004943e22408d84cec28a45e309069e4..39e1299ccbfd33757c4052b8e4aad729b866d766 100644
--- a/ui/ozone/public/client_native_pixmap_factory.cc
+++ b/ui/ozone/public/client_native_pixmap_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 "ui/ozone/public/client_native_pixmap_factory.h"
+#include "ui/gfx/client_native_pixmap_factory.h"
 
 #include "base/trace_event/trace_event.h"
 #include "ui/ozone/platform_object.h"
@@ -10,34 +10,12 @@
 
 namespace ui {
 
-namespace {
-
-ClientNativePixmapFactory* g_instance = nullptr;
-
-}  // namespace
-
-// static
-ClientNativePixmapFactory* ClientNativePixmapFactory::GetInstance() {
-  return g_instance;
-}
-
 // static
-void ClientNativePixmapFactory::SetInstance(
-    ClientNativePixmapFactory* instance) {
-  DCHECK(!g_instance);
-  DCHECK(instance);
-  g_instance = instance;
-}
-
-// static
-std::unique_ptr<ClientNativePixmapFactory> ClientNativePixmapFactory::Create() {
+std::unique_ptr<ClientNativePixmapFactory> OZONE_EXPORT
+ClientNativePixmapFactory::Create() {

[spang, 2017/03/15 20:27:24]

Please don't implement the same function in two different components.

The header is in //ui/gfx but the implementation is in //ui/ozone. It can cause
link errors or other weirdness.

We don't need to have the same factory function for ozone and !ozone, you should
instead use two different declarations and #ifdef the call site.

   TRACE_EVENT1("ozone", "ClientNativePixmapFactory::Create", "platform",
                GetOzonePlatformName());
   return PlatformObject<ClientNativePixmapFactory>::Create();
 }
 
-ClientNativePixmapFactory::ClientNativePixmapFactory() {}
-
-ClientNativePixmapFactory::~ClientNativePixmapFactory() {}
-
 }  // namespace ui