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

content/browser/browser_main_loop.cc

 // Copyright (c) 2012 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 "content/browser/browser_main_loop.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 127 matching lines @@
 #include "base/memory/memory_pressure_monitor_mac.h"
 #include "content/browser/bootstrap_sandbox_manager_mac.h"
 #include "content/browser/cocoa/system_hotkey_helper_mac.h"
 #include "content/browser/mach_broker_mac.h"
 #include "content/browser/renderer_host/browser_compositor_view_mac.h"
 #include "content/browser/theme_helper_mac.h"
 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 #endif
 
 #if defined(USE_OZONE)
-#include "ui/ozone/public/client_native_pixmap_factory.h"
+#include "ui/ozone/public/client_native_pixmap_factory_ozone.h"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commctrl.h>
 #include <shellapi.h>
 
 #include "base/memory/memory_pressure_monitor_win.h"
 #include "base/win/windows_version.h"
 #include "content/browser/screen_orientation/screen_orientation_delegate_win.h"
@@ skipping 649 matching lines @@
 
 #if defined(OS_MACOSX)
   if (BootstrapSandboxManager::ShouldEnable()) {
     TRACE_EVENT0("startup",
                  "BrowserMainLoop::Subsystem:BootstrapSandbox");
     CHECK(BootstrapSandboxManager::GetInstance());
   }
 #endif
 
 #if defined(USE_OZONE)
-  client_native_pixmap_factory_ = ui::ClientNativePixmapFactory::Create();
+  client_native_pixmap_factory_ = ui::CreateClientNativePixmapFactoryOzone();
   ui::ClientNativePixmapFactory::SetInstance(
       client_native_pixmap_factory_.get());
 #endif
 
   if (parsed_command_line_.HasSwitch(switches::kMemoryMetrics)) {
     TRACE_EVENT0("startup", "BrowserMainLoop::Subsystem:MemoryObserver");
     memory_observer_.reset(new MemoryObserver());
     base::MessageLoop::current()->AddTaskObserver(memory_observer_.get());
   }
 
@@ skipping 963 matching lines @@
         BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
         MediaInternals::GetInstance());
   }
   CHECK(audio_manager_);
 
   audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
   CHECK(audio_system_);
 }
 
 }  // namespace content