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

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

Issue 161703002: Add more timezones to the tz selection UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re-upload to get codereview happy Created 6 years, 10 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 | Annotate | Revision Log
« 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 // come up with a better list, we hard-code the following list. It came from 42 // come up with a better list, we hard-code the following list. It came from
43 // from Android initially, but more entries have been added. 43 // from Android initially, but more entries have been added.
44 static const char* kTimeZones[] = { 44 static const char* kTimeZones[] = {
45 "Pacific/Midway", 45 "Pacific/Midway",
46 "Pacific/Honolulu", 46 "Pacific/Honolulu",
47 "America/Anchorage", 47 "America/Anchorage",
48 "America/Los_Angeles", 48 "America/Los_Angeles",
49 "America/Vancouver", 49 "America/Vancouver",
50 "America/Tijuana", 50 "America/Tijuana",
51 "America/Phoenix", 51 "America/Phoenix",
52 "America/Chihuahua",
52 "America/Denver", 53 "America/Denver",
53 "America/Edmonton", 54 "America/Edmonton",
54 "America/Chihuahua", 55 "America/Mazatlan",
55 "America/Regina", 56 "America/Regina",
57 "Pacific/Easter",
56 "America/Costa_Rica", 58 "America/Costa_Rica",
57 "America/Chicago", 59 "America/Chicago",
58 "America/Mexico_City", 60 "America/Mexico_City",
59 "America/Winnipeg", 61 "America/Winnipeg",
60 "America/Bogota", 62 "America/Bogota",
63 "America/Lima",
61 "America/New_York", 64 "America/New_York",
62 "America/Toronto", 65 "America/Toronto",
63 "America/Caracas", 66 "America/Caracas",
64 "America/Barbados", 67 "America/Barbados",
65 "America/Halifax", 68 "America/Halifax",
66 "America/Manaus", 69 "America/Manaus",
67 "America/Santiago", 70 "America/Santiago",
68 "America/St_Johns", 71 "America/St_Johns",
69 "America/Sao_Paulo", 72 "America/Sao_Paulo",
70 "America/Araguaina", 73 "America/Araguaina",
71 "America/Argentina/Buenos_Aires", 74 "America/Argentina/Buenos_Aires",
72 "America/Argentina/San_Luis", 75 "America/Argentina/San_Luis",
73 "America/Montevideo", 76 "America/Montevideo",
74 "America/Godthab", 77 "America/Godthab",
75 "Atlantic/South_Georgia", 78 "Atlantic/South_Georgia",
76 "Atlantic/Cape_Verde", 79 "Atlantic/Cape_Verde",
77 "Atlantic/Azores", 80 "Atlantic/Azores",
81 "Atlantic/Reykjavik",
82 "Atlantic/St_Helena",
78 "Africa/Casablanca", 83 "Africa/Casablanca",
84 "Atlantic/Faroe",
79 "Europe/London", 85 "Europe/London",
80 "Europe/Dublin", 86 "Europe/Dublin",
81 "Europe/Amsterdam", 87 "Europe/Amsterdam",
82 "Europe/Belgrade", 88 "Europe/Belgrade",
83 "Europe/Berlin", 89 "Europe/Berlin",
84 "Europe/Brussels", 90 "Europe/Brussels",
91 "Europe/Budapest",
92 "Europe/Copenhagen",
93 "Europe/Lisbon",
85 "Europe/Madrid", 94 "Europe/Madrid",
95 "Europe/Oslo",
86 "Europe/Paris", 96 "Europe/Paris",
87 "Europe/Rome", 97 "Europe/Rome",
88 "Europe/Stockholm", 98 "Europe/Stockholm",
89 "Europe/Sarajevo", 99 "Europe/Sarajevo",
90 "Europe/Vienna", 100 "Europe/Vienna",
91 "Europe/Warsaw", 101 "Europe/Warsaw",
92 "Europe/Zurich", 102 "Europe/Zurich",
93 "Africa/Windhoek", 103 "Africa/Windhoek",
94 "Africa/Lagos", 104 "Africa/Lagos",
95 "Africa/Brazzaville", 105 "Africa/Brazzaville",
96 "Africa/Cairo", 106 "Africa/Cairo",
97 "Africa/Harare", 107 "Africa/Harare",
98 "Africa/Maputo", 108 "Africa/Maputo",
99 "Africa/Johannesburg", 109 "Africa/Johannesburg",
110 "Europe/Athens",
111 "Europe/Bucharest",
100 "Europe/Helsinki", 112 "Europe/Helsinki",
101 "Europe/Athens", 113 "Europe/Istanbul",
114 "Europe/Kiev",
115 "Europe/Riga",
116 "Europe/Tallinn",
117 "Europe/Vilnius",
102 "Asia/Amman", 118 "Asia/Amman",
103 "Asia/Beirut", 119 "Asia/Beirut",
104 "Asia/Jerusalem", 120 "Asia/Jerusalem",
105 "Europe/Minsk", 121 "Europe/Minsk",
106 "Asia/Baghdad", 122 "Asia/Baghdad",
107 "Asia/Riyadh", 123 "Asia/Riyadh",
108 "Asia/Kuwait", 124 "Asia/Kuwait",
109 "Africa/Nairobi", 125 "Africa/Nairobi",
110 "Asia/Tehran", 126 "Asia/Tehran",
111 "Europe/Moscow", 127 "Europe/Moscow",
(...skipping 10 matching lines...) Expand all
122 "Asia/Colombo", 138 "Asia/Colombo",
123 "Asia/Katmandu", 139 "Asia/Katmandu",
124 "Asia/Yekaterinburg", 140 "Asia/Yekaterinburg",
125 "Asia/Almaty", 141 "Asia/Almaty",
126 "Asia/Dhaka", 142 "Asia/Dhaka",
127 "Asia/Rangoon", 143 "Asia/Rangoon",
128 "Asia/Bangkok", 144 "Asia/Bangkok",
129 "Asia/Jakarta", 145 "Asia/Jakarta",
130 "Asia/Omsk", 146 "Asia/Omsk",
131 "Asia/Novosibirsk", 147 "Asia/Novosibirsk",
148 "Asia/Ho_Chi_Minh",
149 "Asia/Vientiane",
132 "Asia/Shanghai", 150 "Asia/Shanghai",
133 "Asia/Hong_Kong", 151 "Asia/Hong_Kong",
134 "Asia/Kuala_Lumpur", 152 "Asia/Kuala_Lumpur",
135 "Asia/Singapore", 153 "Asia/Singapore",
136 "Asia/Manila", 154 "Asia/Manila",
137 "Asia/Taipei", 155 "Asia/Taipei",
138 "Asia/Makassar", 156 "Asia/Makassar",
139 "Asia/Krasnoyarsk", 157 "Asia/Krasnoyarsk",
140 "Australia/Perth", 158 "Australia/Perth",
141 "Australia/Eucla", 159 "Australia/Eucla",
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 450
433 // static 451 // static
434 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) { 452 base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
435 icu::UnicodeString id; 453 icu::UnicodeString id;
436 timezone.getID(id); 454 timezone.getID(id);
437 return base::string16(id.getBuffer(), id.length()); 455 return base::string16(id.getBuffer(), id.length());
438 } 456 }
439 457
440 } // namespace system 458 } // namespace system
441 } // namespace chromeos 459 } // 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