summaryrefslogtreecommitdiffstats
path: root/chrome/default_plugin
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-14 00:18:52 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-14 00:18:52 +0000
commit67dd36a9a1022bc9a63f74740dff610536e536e8 (patch)
treecbeebef5f78504e1a7ea10c8ba7b1b159fcb0068 /chrome/default_plugin
parent6baca1a4830679c30438cbd95de71f53676dec05 (diff)
downloadchromium_src-67dd36a9a1022bc9a63f74740dff610536e536e8.zip
chromium_src-67dd36a9a1022bc9a63f74740dff610536e536e8.tar.gz
chromium_src-67dd36a9a1022bc9a63f74740dff610536e536e8.tar.bz2
Revert my last two changes.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
-rw-r--r--chrome/default_plugin/plugin_database_handler.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/default_plugin/plugin_database_handler.cc b/chrome/default_plugin/plugin_database_handler.cc
index fcb62b5..cc070754 100644
--- a/chrome/default_plugin/plugin_database_handler.cc
+++ b/chrome/default_plugin/plugin_database_handler.cc
@@ -4,8 +4,13 @@
#include "chrome/default_plugin/plugin_database_handler.h"
-#include "libxml/parser.h"
-#include "libxml/xpath.h"
+#if defined(USE_SYSTEM_LIBXML)
+#include <parser.h>
+#include <xpath.h>
+#else
+#include "third_party/libxml/include/libxml/parser.h"
+#include "third_party/libxml/include/libxml/xpath.h"
+#endif
#include "base/file_util.h"
#include "base/path_service.h"