chrome/browser/ui/webui/options/chromeos/timezone_options_util.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/webui/options/chromeos/timezone_options_util.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/webui/options/chromeos/timezone_options_util.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

index ef6d809f40cf64eec6d3cb339f406a3dcdde070d..8fce13db330923b5159130656cdd0fbff1d102ff 100644

--- a/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

+++ b/chrome/browser/ui/webui/options/chromeos/timezone_options_util.cc

@@ -15,11 +15,11 @@

#include "base/values.h"

#include "chrome/browser/chromeos/system/timezone_settings.h"

#include "grit/generated_resources.h"

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

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

+#include "third_party/icu/public/i18n/unicode/calendar.h"

+#include "third_party/icu/public/i18n/unicode/timezone.h"

#include "ui/base/l10n/l10n_util.h"

-#include "unicode/calendar.h"

-#include "unicode/timezone.h"

-#include "unicode/ures.h"

-#include "unicode/utypes.h"

namespace {