diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 00:29:14 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 00:29:14 +0000 |
| commit | 6999dc89b49b7424f222e6888955d08efce52dde (patch) | |
| tree | 8758cc786a4da5e6af6fd9f6d666038aabeb17cd /chrome/default_plugin | |
| parent | ff1520d89865194d2b00762d2313939b99232d4d (diff) | |
| download | chromium_src-6999dc89b49b7424f222e6888955d08efce52dde.zip chromium_src-6999dc89b49b7424f222e6888955d08efce52dde.tar.gz chromium_src-6999dc89b49b7424f222e6888955d08efce52dde.tar.bz2 | |
* Add rmdir, mkdir -p and umask to d8 on Unix.
* Remove the non-working methods from the os object on d8 on Windows
so you can test for their presence with if (os.system).
* Add a test (not run by default since it only works on d8).
* Fix incorrect use of wait that left defunct processes (zombies).
Committed: http://code.google.com/p/v8/source/detail?r=1650
Review URL: http://codereview.chromium.org/56107
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/default_plugin')
| -rw-r--r-- | chrome/default_plugin/DEPS | 2 | ||||
| -rw-r--r-- | chrome/default_plugin/plugin_database_handler.cc | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/chrome/default_plugin/DEPS b/chrome/default_plugin/DEPS index c004887..6e518f99 100644 --- a/chrome/default_plugin/DEPS +++ b/chrome/default_plugin/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+app", "+grit", # For generated headers - "+third_party/libxml", + "+libxml", "+webkit/glue", ] diff --git a/chrome/default_plugin/plugin_database_handler.cc b/chrome/default_plugin/plugin_database_handler.cc index cc070754..fcb62b5 100644 --- a/chrome/default_plugin/plugin_database_handler.cc +++ b/chrome/default_plugin/plugin_database_handler.cc @@ -4,13 +4,8 @@ #include "chrome/default_plugin/plugin_database_handler.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 "libxml/parser.h" +#include "libxml/xpath.h" #include "base/file_util.h" #include "base/path_service.h" |