diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /chrome/common/child_process_info.cc | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
Diffstat (limited to 'chrome/common/child_process_info.cc')
| -rw-r--r-- | chrome/common/child_process_info.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc index 69122cc..9084646 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -6,7 +6,6 @@ #include <limits> -#include "app/l10n_util.h" #include "base/atomicops.h" #include "base/i18n/rtl.h" #include "base/logging.h" @@ -15,6 +14,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" ChildProcessInfo::ChildProcessInfo(ProcessType type, int id) : type_(type), |