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 | |
| 3cbdf9e3 | 3 | @@ -5,7 +5,7 @@ |
| bbd08e52 ER |
4 | #include <time.h> |
| 5 | ||
| 3cbdf9e3 | 6 | #include "base/compiler_specific.h" |
| bbd08e52 | 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 | ||
| c8e3a0be JP |
23 | --- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc~ 2010-01-07 23:19:11.000000000 +0200 |
| 24 | +++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc 2010-02-02 09:16:08.740140511 +0200 | |
| bbd08e52 ER |
25 | @@ -13,7 +13,7 @@ |
| 26 | ||
| 27 | // These headers must be included in this order to make the declaration gods | |
| 28 | // happy. | |
| 29 | -#include "base/third_party/nspr/prcpucfg_linux.h" | |
| f8f0c762 | 30 | +#include <nspr/prcpucfg.h> |
| bbd08e52 | 31 | |
| c8e3a0be | 32 | namespace webkit { |
| f1b276d4 | 33 | |
| eeb2e662 ER |
34 | --- chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~ 2010-07-21 05:01:25.000000000 +0300 |
| 35 | +++ chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc 2010-07-22 13:58:51.340525649 +0300 | |
| 36 | @@ -16,7 +16,7 @@ | |
| 37 | #include "base/scoped_ptr.h" | |
| f1b276d4 ER |
38 | #include "base/string_util.h" |
| 39 | #include "base/sys_info.h" | |
| 40 | -#include "base/third_party/nspr/prtime.h" | |
| f8f0c762 | 41 | +#include <nspr/prtime.h> |
| eeb2e662 ER |
42 | #include "base/time.h" |
| 43 | #include "base/utf_string_conversions.h" | |
| f1b276d4 | 44 | #include "chrome/browser/autocomplete/autocomplete.h" |
| f4a8da6a ER |
45 | --- a/src/chrome/common/metrics/metrics_log_base.cc~ 2012-02-09 03:36:29.000000000 +0100 |
| 46 | +++ b/src/chrome/common/metrics/metrics_log_base.cc 2012-02-12 16:17:46.992725484 +0100 | |
| 47 | @@ -10,7 +10,7 @@ | |
| b066feb8 | 48 | #include "base/perftimer.h" |
| c8e3a0be JP |
49 | #include "base/string_number_conversions.h" |
| 50 | #include "base/sys_info.h" | |
| c8e3a0be JP |
51 | -#include "base/third_party/nspr/prtime.h" |
| 52 | +#include <nspr/prtime.h> | |
| b066feb8 | 53 | #include "base/utf_string_conversions.h" |
| c8e3a0be | 54 | #include "chrome/common/logging_chrome.h" |
| f4a8da6a ER |
55 | #include "libxml/xmlwriter.h" |
| 56 |