summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager/task_manager.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 22:33:47 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-07 22:33:47 +0000
commitc297d3a13ae36bf2f574e55b3f1f9494b3f98e7b (patch)
tree6d4bcd167b01ccf9fe91dd4e8b5c4d5d44124982 /chrome/browser/task_manager/task_manager.cc
parent47d20da2c60b132ba2cd3b94f9be9c38fc609ad2 (diff)
downloadchromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.zip
chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.tar.gz
chromium_src-c297d3a13ae36bf2f574e55b3f1f9494b3f98e7b.tar.bz2
Roll ICU and convert include style to standard Chromium style,
i.e. third_party/... BUG=165264 Review URL: https://codereview.chromium.org/11734021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager.cc')
-rw-r--r--chrome/browser/task_manager/task_manager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc
index 9dedc57..0ad35fa 100644
--- a/chrome/browser/task_manager/task_manager.cc
+++ b/chrome/browser/task_manager/task_manager.cc
@@ -43,11 +43,11 @@
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "grit/ui_resources.h"
+#include "third_party/icu/public/i18n/unicode/coll.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/text/bytes_formatting.h"
#include "ui/gfx/image/image_skia.h"
-#include "unicode/coll.h"
using content::BrowserThread;
using content::OpenURLParams;