projects / packages / chromium-browser.git / blame
| Commit | Line | Data |
|---|---|---|
| bbd08e52 ER |
1 | --- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code 2009-08-27 15:21:27.000000000 -0400 |
| 2 | +++ chromium-20090827svn24640/src/base/pr_time_unittest.cc 2009-08-27 16:05:17.000000000 -0400 | |
| 3 | @@ -4,7 +4,7 @@ | |
| 4 | ||
| 5 | #include <time.h> | |
| 6 | ||
| 7 | -#include "base/third_party/nspr/prtime.h" | |
| f8f0c762 | 8 | +#include <nspr/prtime.h> |
| bbd08e52 ER |
9 | #include "base/time.h" |
| 10 | #include "testing/gtest/include/gtest/gtest.h" | |
| 11 | ||
| bbd08e52 ER |
12 | --- chromium-20090827svn24640/src/base/time.cc.system-code 2009-08-27 15:21:28.000000000 -0400 |
| 13 | +++ chromium-20090827svn24640/src/base/time.cc 2009-08-27 16:05:17.000000000 -0400 | |
| 14 | @@ -5,7 +5,7 @@ | |
| 15 | #include "base/time.h" | |
| 16 | #include "base/string_util.h" | |
| 17 | #include "base/sys_string_conversions.h" | |
| 18 | -#include "base/third_party/nspr/prtime.h" | |
| f8f0c762 | 19 | +#include <nspr/prtime.h> |
| bbd08e52 ER |
20 | |
| 21 | #include "base/logging.h" | |
| 22 | ||
| bbd08e52 ER |
23 | --- chromium-20090827svn24640/src/chrome/common/zip.cc.system-code 2009-08-27 15:22:46.000000000 -0400 |
| 24 | +++ chromium-20090827svn24640/src/chrome/common/zip.cc 2009-08-27 16:05:17.000000000 -0400 | |
| 25 | @@ -7,8 +7,8 @@ | |
| 26 | #include "base/file_util.h" | |
| 27 | #include "base/string_util.h" | |
| 28 | #include "net/base/file_stream.h" | |
| 29 | -#include "third_party/zlib/contrib/minizip/unzip.h" | |
| 30 | -#include "third_party/zlib/contrib/minizip/zip.h" | |
| 31 | +#include <minizip/unzip.h> | |
| 32 | +#include <minizip/zip.h> | |
| 33 | #if defined(OS_WIN) | |
| 34 | #include "third_party/zlib/contrib/minizip/iowin32.h" | |
| 35 | #endif | |
| 4c0729f0 AM |
36 | --- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_posix.cc~ 2010-01-07 23:19:11.000000000 +0200 |
| 37 | +++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/glue/plugins/plugin_lib_posix.cc 2010-02-02 09:16:08.740140511 +0200 | |
| bbd08e52 ER |
38 | @@ -13,7 +13,7 @@ |
| 39 | ||
| 40 | // These headers must be included in this order to make the declaration gods | |
| 41 | // happy. | |
| 42 | -#include "base/third_party/nspr/prcpucfg_linux.h" | |
| f8f0c762 | 43 | +#include <nspr/prcpucfg.h> |
| bbd08e52 ER |
44 | |
| 45 | namespace { | |
| f1b276d4 | 46 | |
| eeb2e662 ER |
47 | --- chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~ 2010-07-21 05:01:25.000000000 +0300 |
| 48 | +++ chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc 2010-07-22 13:58:51.340525649 +0300 | |
| 49 | @@ -16,7 +16,7 @@ | |
| 50 | #include "base/scoped_ptr.h" | |
| f1b276d4 ER |
51 | #include "base/string_util.h" |
| 52 | #include "base/sys_info.h" | |
| 53 | -#include "base/third_party/nspr/prtime.h" | |
| f8f0c762 | 54 | +#include <nspr/prtime.h> |
| eeb2e662 ER |
55 | #include "base/time.h" |
| 56 | #include "base/utf_string_conversions.h" | |
| f1b276d4 | 57 | #include "chrome/browser/autocomplete/autocomplete.h" |