chrome/browser/task_manager/task_manager.cc - Issue 11734021: Roll ICU and convert include style to standard Chromium style,

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/task_manager/task_manager.cc

Issue 11734021: Roll ICU and convert include style to standard Chromium style, (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/task_manager/task_manager.cc

diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc

index 9dedc57b30dc987effd09582dbc54386a49b78d8..0ad35fa5287b94b21b7205f1153fe65d95491d2d 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;