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

Unified Diff: printing/metafile_impl.h

Issue 12896006: mac: Clean up a few more uses of USE_SKIA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mac Created 7 years, 9 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/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc ('k') | webkit/glue/webkit_glue.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/metafile_impl.h
diff --git a/printing/metafile_impl.h b/printing/metafile_impl.h
index 38c68a3185f0146c277400057f7e074c2836e1f5..840a1cede68ccad26eac75303d9ffedf1fcd7b17 100644
--- a/printing/metafile_impl.h
+++ b/printing/metafile_impl.h
@@ -5,14 +5,10 @@
#ifndef PRINTING_METAFILE_IMPL_H_
#define PRINTING_METAFILE_IMPL_H_
+#include "printing/pdf_metafile_skia.h"
+
#if defined(OS_WIN)
#include "printing/emf_win.h"
-#elif defined(OS_MACOSX)
-#include "printing/pdf_metafile_cg_mac.h"
-#endif
-
-#if !defined(OS_MACOSX) || defined(USE_SKIA)
-#include "printing/pdf_metafile_skia.h"
#endif
namespace printing {
@@ -20,14 +16,6 @@ namespace printing {
#if defined(OS_WIN)
typedef Emf NativeMetafile;
typedef PdfMetafileSkia PreviewMetafile;
-#elif defined(OS_MACOSX)
-#if defined(USE_SKIA)
-typedef PdfMetafileSkia NativeMetafile;
-typedef PdfMetafileSkia PreviewMetafile;
-#else
-typedef PdfMetafileCg NativeMetafile;
-typedef PdfMetafileCg PreviewMetafile;
-#endif
#elif defined(OS_POSIX)
typedef PdfMetafileSkia NativeMetafile;
typedef PdfMetafileSkia PreviewMetafile;
« no previous file with comments | « content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.cc ('k') | webkit/glue/webkit_glue.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698