| Index: ui/gfx/client_native_pixmap_factory.cc
|
| diff --git a/ui/ozone/public/client_native_pixmap_factory.cc b/ui/gfx/client_native_pixmap_factory.cc
|
| similarity index 68%
|
| copy from ui/ozone/public/client_native_pixmap_factory.cc
|
| copy to ui/gfx/client_native_pixmap_factory.cc
|
| index 0db394ac004943e22408d84cec28a45e309069e4..08ffba7cd96c8442b3ed0c09677193ba39c78e23 100644
|
| --- a/ui/ozone/public/client_native_pixmap_factory.cc
|
| +++ b/ui/gfx/client_native_pixmap_factory.cc
|
| @@ -2,11 +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 "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 {
|
|
|
| @@ -29,12 +25,13 @@ void ClientNativePixmapFactory::SetInstance(
|
| g_instance = instance;
|
| }
|
|
|
| +#if !defined(OS_LINUX) && !defined(USE_OZONE)
|
| // static
|
| std::unique_ptr<ClientNativePixmapFactory> ClientNativePixmapFactory::Create() {
|
| - TRACE_EVENT1("ozone", "ClientNativePixmapFactory::Create", "platform",
|
| - GetOzonePlatformName());
|
| - return PlatformObject<ClientNativePixmapFactory>::Create();
|
| + NOTREACHED();
|
| + return nullptr;
|
| }
|
| +#endif
|
|
|
| ClientNativePixmapFactory::ClientNativePixmapFactory() {}
|
|
|
|
|