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

ui/gfx/client_native_pixmap_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // 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 "base/trace_event/trace_event.h"
-#include "ui/ozone/platform_object.h"
-#include "ui/ozone/platform_selection.h"
+#include "ui/gfx/client_native_pixmap_factory.h"
 
 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;
 }
 
+#if !defined(OS_LINUX) && !defined(USE_OZONE)

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

This looks weird to me ... is this file actually getting compiled on !linux ? I
don't think it should be.

 // static
 std::unique_ptr<ClientNativePixmapFactory> ClientNativePixmapFactory::Create() {
-  TRACE_EVENT1("ozone", "ClientNativePixmapFactory::Create", "platform",
-               GetOzonePlatformName());
-  return PlatformObject<ClientNativePixmapFactory>::Create();
+  NOTREACHED();
+  return nullptr;
 }
+#endif
 
 ClientNativePixmapFactory::ClientNativePixmapFactory() {}
 
 ClientNativePixmapFactory::~ClientNativePixmapFactory() {}
 
 }  // namespace ui