diff options
Diffstat (limited to 'chromium/content')
| -rw-r--r-- | chromium/content/browser/renderer_host/render_sandbox_host_linux.cc | 2 | ||||
| -rw-r--r-- | chromium/content/renderer/npapi/webplugin_delegate_proxy.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc b/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc index 19cbc5b4b35..f4e1cfc6e41 100644 --- a/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc +++ b/chromium/content/browser/renderer_host/render_sandbox_host_linux.cc @@ -709,7 +709,7 @@ void RenderSandboxHostLinux::Init(const std::string& sandbox_path) { childs_lifeline_fd_ = pipefds[1]; // We need to be monothreaded before we fork(). -#if !defined(TOOLKIT_GTK) +#if !defined(TOOLKIT_GTK) && !defined(TOOLKIT_QT) // Exclude gtk port as TestSuite in base/tests/test_suite.cc is calling // gtk_init. // TODO(oshima): Remove ifdef when above issues are resolved. diff --git a/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc b/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc index d7f847240b0..a6418fb5a8f 100644 --- a/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc +++ b/chromium/content/renderer/npapi/webplugin_delegate_proxy.cc @@ -6,7 +6,7 @@ #if defined(TOOLKIT_GTK) #include <gtk/gtk.h> -#elif defined(USE_X11) +#elif defined(USE_CAIRO) #include <cairo/cairo.h> #endif |