summaryrefslogtreecommitdiffstats
path: root/chrome/renderer
diff options
context:
space:
mode:
authorpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 19:52:16 +0000
committerpvalchev@google.com <pvalchev@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-09 19:52:16 +0000
commit753efc479384c254e263fd11390846a060fa6ce0 (patch)
tree488097f0622c5d744059f3c2ada4894b683c5305 /chrome/renderer
parent5e4d24d67febed160e2020f5c8f13d8073921fc4 (diff)
downloadchromium_src-753efc479384c254e263fd11390846a060fa6ce0.zip
chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.gz
chromium_src-753efc479384c254e263fd11390846a060fa6ce0.tar.bz2
BSD ifdefs, etc. necessary for chrome/
Review URL: http://codereview.chromium.org/656009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
-rw-r--r--chrome/renderer/print_web_view_helper.h4
-rw-r--r--chrome/renderer/webplugin_delegate_proxy.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/renderer/print_web_view_helper.h b/chrome/renderer/print_web_view_helper.h
index 44ae591..1a4f5aa 100644
--- a/chrome/renderer/print_web_view_helper.h
+++ b/chrome/renderer/print_web_view_helper.h
@@ -20,7 +20,7 @@ namespace IPC {
class Message;
}
-#if defined(OS_LINUX)
+#if defined(USE_X11)
namespace printing {
class PdfPsMetafile;
typedef PdfPsMetafile NativeMetafile;
@@ -93,7 +93,7 @@ class PrintWebViewHelper : public WebKit::WebViewClient {
WebKit::WebFrame* web_frame);
// Prints the page listed in |params|.
-#if defined(OS_LINUX)
+#if defined(USE_X11)
void PrintPage(const ViewMsg_PrintPage_Params& params,
const gfx::Size& canvas_size,
WebKit::WebFrame* frame,
diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc
index 1e64648..b00f1b5 100644
--- a/chrome/renderer/webplugin_delegate_proxy.cc
+++ b/chrome/renderer/webplugin_delegate_proxy.cc
@@ -4,7 +4,7 @@
#include "chrome/renderer/webplugin_delegate_proxy.h"
-#if defined(OS_LINUX)
+#if defined(TOOLKIT_USES_GTK)
#include <gtk/gtk.h>
#endif
@@ -579,7 +579,7 @@ bool WebPluginDelegateProxy::CreateBitmap(
int height = plugin_rect_.height();
const size_t stride = skia::PlatformCanvas::StrideForWidth(width);
const size_t size = stride * height;
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
memory->reset(TransportDIB::Create(size, 0));
if (!memory->get())
return false;