Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Side by Side Diff: chromeos/settings/timezone_settings.cc

Issue 548683002: Update the timezone list to show in the UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chromeos/settings/timezone_settings.h" 5 #include "chromeos/settings/timezone_settings.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 "Europe/Vienna", 103 "Europe/Vienna",
104 "Europe/Warsaw", 104 "Europe/Warsaw",
105 "Europe/Zurich", 105 "Europe/Zurich",
106 "Africa/Windhoek", 106 "Africa/Windhoek",
107 "Africa/Lagos", 107 "Africa/Lagos",
108 "Africa/Brazzaville", 108 "Africa/Brazzaville",
109 "Africa/Cairo", 109 "Africa/Cairo",
110 "Africa/Harare", 110 "Africa/Harare",
111 "Africa/Maputo", 111 "Africa/Maputo",
112 "Africa/Johannesburg", 112 "Africa/Johannesburg",
113 "Europe/Kaliningrad",
113 "Europe/Athens", 114 "Europe/Athens",
114 "Europe/Bucharest", 115 "Europe/Bucharest",
115 "Europe/Chisinau", 116 "Europe/Chisinau",
116 "Europe/Helsinki", 117 "Europe/Helsinki",
117 "Europe/Istanbul", 118 "Europe/Istanbul",
118 "Europe/Kiev", 119 "Europe/Kiev",
119 "Europe/Riga", 120 "Europe/Riga",
120 "Europe/Sofia", 121 "Europe/Sofia",
121 "Europe/Tallinn", 122 "Europe/Tallinn",
122 "Europe/Vilnius", 123 "Europe/Vilnius",
123 "Asia/Amman", 124 "Asia/Amman",
124 "Asia/Beirut", 125 "Asia/Beirut",
125 "Asia/Jerusalem", 126 "Asia/Jerusalem",
126 "Africa/Nairobi", 127 "Africa/Nairobi",
127 "Asia/Baghdad", 128 "Asia/Baghdad",
128 "Asia/Riyadh", 129 "Asia/Riyadh",
129 "Asia/Kuwait", 130 "Asia/Kuwait",
130 "Europe/Minsk", 131 "Europe/Minsk",
132 "Europe/Moscow",
131 "Asia/Tehran", 133 "Asia/Tehran",
132 "Europe/Moscow", 134 "Europe/Samara",
133 "Asia/Dubai", 135 "Asia/Dubai",
134 "Asia/Tbilisi", 136 "Asia/Tbilisi",
135 "Indian/Mauritius", 137 "Indian/Mauritius",
136 "Asia/Baku", 138 "Asia/Baku",
137 "Asia/Yerevan", 139 "Asia/Yerevan",
138 "Asia/Kabul", 140 "Asia/Kabul",
139 "Asia/Karachi", 141 "Asia/Karachi",
140 "Asia/Ashgabat", 142 "Asia/Ashgabat",
141 "Asia/Oral", 143 "Asia/Oral",
144 "Asia/Yekaterinburg",
142 "Asia/Calcutta", 145 "Asia/Calcutta",
143 "Asia/Colombo", 146 "Asia/Colombo",
144 "Asia/Katmandu", 147 "Asia/Katmandu",
145 "Asia/Yekaterinburg", 148 "Asia/Omsk",
146 "Asia/Almaty", 149 "Asia/Almaty",
147 "Asia/Dhaka", 150 "Asia/Dhaka",
151 "Asia/Novosibirsk",
148 "Asia/Rangoon", 152 "Asia/Rangoon",
149 "Asia/Bangkok", 153 "Asia/Bangkok",
150 "Asia/Jakarta", 154 "Asia/Jakarta",
151 "Asia/Omsk", 155 "Asia/Krasnoyarsk",
152 "Asia/Novosibirsk", 156 "Asia/Novokuznetsk",
153 "Asia/Ho_Chi_Minh", 157 "Asia/Ho_Chi_Minh",
154 "Asia/Phnom_Penh", 158 "Asia/Phnom_Penh",
155 "Asia/Vientiane", 159 "Asia/Vientiane",
156 "Asia/Shanghai", 160 "Asia/Shanghai",
157 "Asia/Hong_Kong", 161 "Asia/Hong_Kong",
158 "Asia/Kuala_Lumpur", 162 "Asia/Kuala_Lumpur",
159 "Asia/Singapore", 163 "Asia/Singapore",
160 "Asia/Manila", 164 "Asia/Manila",
161 "Asia/Taipei", 165 "Asia/Taipei",
162 "Asia/Makassar", 166 "Asia/Makassar",
163 "Asia/Krasnoyarsk", 167 "Asia/Irkutsk",
168 "Asia/Yakutsk",
164 "Australia/Perth", 169 "Australia/Perth",
165 "Australia/Eucla", 170 "Australia/Eucla",
166 "Asia/Irkutsk",
167 "Asia/Seoul", 171 "Asia/Seoul",
168 "Asia/Tokyo", 172 "Asia/Tokyo",
169 "Asia/Jayapura", 173 "Asia/Jayapura",
174 "Asia/Sakhalin",
175 "Asia/Vladivostok",
176 "Asia/Magadan",
170 "Australia/Darwin", 177 "Australia/Darwin",
171 "Australia/Adelaide", 178 "Australia/Adelaide",
172 "Asia/Yakutsk",
173 "Pacific/Guam", 179 "Pacific/Guam",
174 "Australia/Brisbane", 180 "Australia/Brisbane",
175 "Australia/Hobart", 181 "Australia/Hobart",
176 "Australia/Sydney", 182 "Australia/Sydney",
183 "Asia/Anadyr",
177 "Pacific/Port_Moresby", 184 "Pacific/Port_Moresby",
178 "Asia/Vladivostok", 185 "Asia/Kamchatka",
179 "Asia/Sakhalin",
180 "Asia/Magadan",
181 "Pacific/Fiji", 186 "Pacific/Fiji",
182 "Pacific/Majuro", 187 "Pacific/Majuro",
183 "Pacific/Auckland", 188 "Pacific/Auckland",
184 "Pacific/Tongatapu", 189 "Pacific/Tongatapu",
185 "Pacific/Apia", 190 "Pacific/Apia",
186 "Pacific/Kiritimati", 191 "Pacific/Kiritimati",
187 }; 192 };
188 193
189 std::string GetTimezoneIDAsString() { 194 std::string GetTimezoneIDAsString() {
190 // Compare with chromiumos/src/platform/init/ui.conf which fixes certain 195 // Compare with chromiumos/src/platform/init/ui.conf which fixes certain
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 461
457 // static 462 // static
458 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) { 463 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
459 icu::UnicodeString id; 464 icu::UnicodeString id;
460 timezone.getID(id); 465 timezone.getID(id);
461 return base::string16(id.getBuffer(), id.length()); 466 return base::string16(id.getBuffer(), id.length());
462 } 467 }
463 468
464 } // namespace system 469 } // namespace system
465 } // namespace chromeos 470 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698