base/i18n/timezone.cc - Issue 2740673002: Prepare Chromium and Blink for ICU 59

Side by Side Diff

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

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

Side by Side Diff: base/i18n/timezone.cc

Issue 2740673002: Prepare Chromium and Blink for ICU 59 (Closed)

Patch Set: revert accidental revert of sftnly roll during rebase Created 3 years, 9 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:

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/i18n/timezone.h"	5 #include "base/i18n/timezone.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8 #include <string.h>	8 #include <string.h>

9	9

10 #include <map>	10 #include <map>

(...skipping 592 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
603	603

604 DISALLOW_COPY_AND_ASSIGN(TimezoneMap);	604 DISALLOW_COPY_AND_ASSIGN(TimezoneMap);

605 };	605 };

606	606

607 } // namespace	607 } // namespace

608	608

609 std::string CountryCodeForCurrentTimezone() {	609 std::string CountryCodeForCurrentTimezone() {

610 std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());	610 std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());

611 icu::UnicodeString id;	611 icu::UnicodeString id;

612 zone->getID(id);	612 zone->getID(id);

613 string16 olson_code(id.getBuffer(), id.length());	613 std::string olson_code;

614 return TimezoneMap::GetInstance()->CountryCodeForTimezone(	614 return TimezoneMap::GetInstance()->CountryCodeForTimezone(

615 UTF16ToUTF8(olson_code));	615 id.toUTF8String(olson_code));

616 }	616 }

617	617

618 } // namespace base	618 } // namespace base

OLD	NEW

« no previous file with comments | « base/i18n/time_formatting_unittest.cc ('k') | base/i18n/unicodestring.h » ('j') | no next file with comments »