Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

Unified Diff: content/browser/compositor/gpu_process_transport_factory.cc

Issue 312393002: ozone: Move the factory interfaces into a common target. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r278697 Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/DEPS ('k') | content/browser/compositor/overlay_candidate_validator_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/gpu_process_transport_factory.cc
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index d268b94bdaea9d0888e4d73057e45a0a727f5394..bdf7cb4904a1a09ad937a0e96ef7a842640f7058 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -48,7 +48,7 @@
#elif defined(USE_OZONE)
#include "content/browser/compositor/overlay_candidate_validator_ozone.h"
#include "content/browser/compositor/software_output_device_ozone.h"
-#include "ui/gfx/ozone/surface_factory_ozone.h"
+#include "ui/ozone/public/surface_factory_ozone.h"
#elif defined(USE_X11)
#include "content/browser/compositor/software_output_device_x11.h"
#elif defined(OS_MACOSX)
@@ -121,8 +121,8 @@ scoped_ptr<cc::SoftwareOutputDevice> CreateSoftwareOutputDevice(
scoped_ptr<cc::OverlayCandidateValidator> CreateOverlayCandidateValidator(
gfx::AcceleratedWidget widget) {
#if defined(USE_OZONE)
- gfx::OverlayCandidatesOzone* overlay_candidates =
- gfx::SurfaceFactoryOzone::GetInstance()->GetOverlayCandidates(widget);
+ ui::OverlayCandidatesOzone* overlay_candidates =
+ ui::SurfaceFactoryOzone::GetInstance()->GetOverlayCandidates(widget);
if (overlay_candidates && CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableHardwareOverlays)) {
return scoped_ptr<cc::OverlayCandidateValidator>(
« no previous file with comments | « content/DEPS ('k') | content/browser/compositor/overlay_candidate_validator_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698