chrome/browser/ui/prefs/prefs_tab_helper.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/ui/prefs/prefs_tab_helper.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/ui/prefs/prefs_tab_helper.cc

diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc

index 9dde066d79edac8e5541f47cbaca1a80f9471470..62f38789c9add4ae50359245cbc3a893b5b9dd69 100644

--- a/chrome/browser/ui/prefs/prefs_tab_helper.cc

+++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc

@@ -23,8 +23,8 @@

#include "content/public/browser/web_contents.h"

#include "grit/locale_settings.h"

#include "grit/platform_locale_settings.h"

-#include "unicode/uchar.h"

-#include "unicode/uscript.h"

+#include "third_party/icu/public/common/unicode/uchar.h"

+#include "third_party/icu/public/common/unicode/uscript.h"

#include "webkit/glue/webpreferences.h"

#if defined(OS_POSIX) && !defined(OS_MACOSX) && defined(ENABLE_THEMES)