OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "components/error_page/common/localized_error.h" | 5 #include "components/error_page/common/localized_error.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 27 matching lines...) Expand all Loading... | |
38 #endif | 38 #endif |
39 | 39 |
40 namespace error_page { | 40 namespace error_page { |
41 | 41 |
42 namespace { | 42 namespace { |
43 | 43 |
44 // Some error pages have no details. | 44 // Some error pages have no details. |
45 const unsigned int kErrorPagesNoDetails = 0; | 45 const unsigned int kErrorPagesNoDetails = 0; |
46 | 46 |
47 static const char kRedirectLoopLearnMoreUrl[] = | 47 static const char kRedirectLoopLearnMoreUrl[] = |
48 "https://support.google.com/chrome/answer/95626"; | 48 "https://support.google.com/chrome?p=rl_error"; |
49 static const char kWeakDHKeyLearnMoreUrl[] = | 49 static const char kWeakDHKeyLearnMoreUrl[] = |
50 "https://support.google.com/chrome?p=dh_error"; | 50 "https://support.google.com/chrome?p=dh_error"; |
51 static const int kGoogleCachedCopySuggestionType = 0; | 51 static const int kGoogleCachedCopySuggestionType = 0; |
52 | 52 |
53 enum NAV_SUGGESTIONS { | 53 enum NAV_SUGGESTIONS { |
54 SUGGEST_NONE = 0, | 54 SUGGEST_NONE = 0, |
55 SUGGEST_RELOAD = 1 << 0, | 55 SUGGEST_RELOAD = 1 << 0, |
56 SUGGEST_CHECK_CONNECTION = 1 << 1, | 56 SUGGEST_CHECK_CONNECTION = 1 << 1, |
57 SUGGEST_DNS_CONFIG = 1 << 2, | 57 SUGGEST_DNS_CONFIG = 1 << 2, |
58 SUGGEST_FIREWALL_CONFIG = 1 << 3, | 58 SUGGEST_FIREWALL_CONFIG = 1 << 3, |
59 SUGGEST_PROXY_CONFIG = 1 << 4, | 59 SUGGEST_PROXY_CONFIG = 1 << 4, |
60 SUGGEST_DISABLE_EXTENSION = 1 << 5, | 60 SUGGEST_DISABLE_EXTENSION = 1 << 5, |
61 SUGGEST_LEARNMORE = 1 << 6, | 61 SUGGEST_LEARNMORE = 1 << 6, |
62 SUGGEST_VIEW_POLICIES = 1 << 7, | 62 SUGGEST_VIEW_POLICIES = 1 << 7, |
63 SUGGEST_CONTACT_ADMINISTRATOR = 1 << 8, | 63 // Unprefixed suggestion which occurs in a list. |
64 SUGGEST_UNSUPPORTED_CIPHER = 1 << 9, | 64 SUGGEST_CONTACT_ADMINISTRATOR = 1 << 8, |
65 // Standalone suggestion which includes 'Try' prefix to the sentence. | |
mmenke
2016/02/22 19:09:41
Just to be perfectly clear, suggest "Standalone su
edwardjung
2016/02/23 14:09:00
Done.
| |
66 SUGGEST_CONTACT_ADMINISTRATOR_STANDALONE = 1 << 9, | |
67 SUGGEST_UNSUPPORTED_CIPHER = 1 << 10, | |
68 SUGGEST_ANTIVIRUS_CONFIG = 1 << 11, | |
69 SUGGEST_OFFLINE_CHECKS = 1 << 13, | |
70 SUGGEST_COMPLETE_SETUP = 1 << 14, | |
65 }; | 71 }; |
66 | 72 |
67 struct LocalizedErrorMap { | 73 struct LocalizedErrorMap { |
68 int error_code; | 74 int error_code; |
69 unsigned int title_resource_id; | 75 unsigned int title_resource_id; |
70 unsigned int heading_resource_id; | 76 unsigned int heading_resource_id; |
71 // Detailed summary used when the error is in the main frame. | 77 // Detailed summary used when the error is in the main frame. |
72 unsigned int summary_resource_id; | 78 unsigned int summary_resource_id; |
73 // Short one sentence description shown on mouse over when the error is in | 79 // Short one sentence description shown on mouse over when the error is in |
74 // a frame. | 80 // a frame. |
75 unsigned int details_resource_id; | 81 unsigned int details_resource_id; |
76 int suggestions; // Bitmap of SUGGEST_* values. | 82 int suggestions; // Bitmap of SUGGEST_* values. |
77 unsigned int error_explanation_id; | |
78 }; | 83 }; |
79 | 84 |
80 const LocalizedErrorMap net_error_options[] = { | 85 const LocalizedErrorMap net_error_options[] = { |
81 {net::ERR_TIMED_OUT, | 86 {net::ERR_TIMED_OUT, |
82 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 87 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
83 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 88 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
84 IDS_ERRORPAGES_SUMMARY_TIMED_OUT, | 89 IDS_ERRORPAGES_SUMMARY_TIMED_OUT, |
85 IDS_ERRORPAGES_DETAILS_TIMED_OUT, | 90 IDS_ERRORPAGES_DETAILS_TIMED_OUT, |
86 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | | 91 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | |
87 SUGGEST_PROXY_CONFIG, | 92 SUGGEST_PROXY_CONFIG, |
88 }, | 93 }, |
89 {net::ERR_CONNECTION_TIMED_OUT, | 94 {net::ERR_CONNECTION_TIMED_OUT, |
90 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 95 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
91 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 96 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
92 IDS_ERRORPAGES_SUMMARY_TIMED_OUT, | 97 IDS_ERRORPAGES_SUMMARY_TIMED_OUT, |
93 IDS_ERRORPAGES_DETAILS_TIMED_OUT, | 98 IDS_ERRORPAGES_DETAILS_TIMED_OUT, |
94 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | | 99 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | |
95 SUGGEST_PROXY_CONFIG, | 100 SUGGEST_PROXY_CONFIG, |
96 }, | 101 }, |
97 {net::ERR_CONNECTION_CLOSED, | 102 {net::ERR_CONNECTION_CLOSED, |
98 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 103 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
99 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 104 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
100 IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED, | 105 IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED, |
101 IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED, | 106 IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED, |
102 SUGGEST_RELOAD, | 107 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | |
108 SUGGEST_PROXY_CONFIG, | |
103 }, | 109 }, |
104 {net::ERR_CONNECTION_RESET, | 110 {net::ERR_CONNECTION_RESET, |
105 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 111 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
106 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 112 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
107 IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET, | 113 IDS_ERRORPAGES_SUMMARY_CONNECTION_RESET, |
108 IDS_ERRORPAGES_DETAILS_CONNECTION_RESET, | 114 IDS_ERRORPAGES_DETAILS_CONNECTION_RESET, |
109 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | | 115 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | |
110 SUGGEST_PROXY_CONFIG, | 116 SUGGEST_PROXY_CONFIG, |
111 }, | 117 }, |
112 {net::ERR_CONNECTION_REFUSED, | 118 {net::ERR_CONNECTION_REFUSED, |
(...skipping 24 matching lines...) Expand all Loading... | |
137 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 143 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
138 IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION, | 144 IDS_ERRORPAGES_SUMMARY_ICANN_NAME_COLLISION, |
139 IDS_ERRORPAGES_DETAILS_ICANN_NAME_COLLISION, | 145 IDS_ERRORPAGES_DETAILS_ICANN_NAME_COLLISION, |
140 SUGGEST_NONE, | 146 SUGGEST_NONE, |
141 }, | 147 }, |
142 {net::ERR_ADDRESS_UNREACHABLE, | 148 {net::ERR_ADDRESS_UNREACHABLE, |
143 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 149 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
144 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 150 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
145 IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE, | 151 IDS_ERRORPAGES_SUMMARY_ADDRESS_UNREACHABLE, |
146 IDS_ERRORPAGES_DETAILS_ADDRESS_UNREACHABLE, | 152 IDS_ERRORPAGES_DETAILS_ADDRESS_UNREACHABLE, |
147 SUGGEST_RELOAD | SUGGEST_FIREWALL_CONFIG | SUGGEST_PROXY_CONFIG, | 153 SUGGEST_RELOAD, |
148 }, | 154 }, |
149 {net::ERR_NETWORK_ACCESS_DENIED, | 155 {net::ERR_NETWORK_ACCESS_DENIED, |
150 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 156 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
151 IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED, | 157 IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED, |
152 IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED, | 158 IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED, |
153 IDS_ERRORPAGES_DETAILS_NETWORK_ACCESS_DENIED, | 159 IDS_ERRORPAGES_DETAILS_NETWORK_ACCESS_DENIED, |
154 SUGGEST_FIREWALL_CONFIG, | 160 SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG | |
161 SUGGEST_ANTIVIRUS_CONFIG, | |
155 }, | 162 }, |
156 {net::ERR_PROXY_CONNECTION_FAILED, | 163 {net::ERR_PROXY_CONNECTION_FAILED, |
157 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 164 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
158 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, | 165 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, |
159 IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED, | 166 IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED, |
160 IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED, | 167 IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED, |
161 SUGGEST_PROXY_CONFIG, | 168 SUGGEST_PROXY_CONFIG | SUGGEST_CONTACT_ADMINISTRATOR, |
162 }, | 169 }, |
163 {net::ERR_INTERNET_DISCONNECTED, | 170 {net::ERR_INTERNET_DISCONNECTED, |
164 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 171 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
165 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, | 172 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, |
166 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED, | 173 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED, |
167 IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED, | 174 IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED, |
168 SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG, | 175 SUGGEST_OFFLINE_CHECKS, |
169 }, | 176 }, |
170 {net::ERR_FILE_NOT_FOUND, | 177 {net::ERR_FILE_NOT_FOUND, |
171 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 178 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
172 IDS_ERRORPAGES_HEADING_FILE_NOT_FOUND, | 179 IDS_ERRORPAGES_HEADING_FILE_NOT_FOUND, |
173 IDS_ERRORPAGES_SUMMARY_FILE_NOT_FOUND, | 180 IDS_ERRORPAGES_SUMMARY_FILE_NOT_FOUND, |
174 IDS_ERRORPAGES_DETAILS_FILE_NOT_FOUND, | 181 IDS_ERRORPAGES_DETAILS_FILE_NOT_FOUND, |
175 SUGGEST_RELOAD, | 182 SUGGEST_RELOAD, |
176 }, | 183 }, |
177 {net::ERR_CACHE_MISS, | 184 {net::ERR_CACHE_MISS, |
178 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 185 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
242 IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING, | 249 IDS_ERRORPAGES_HEADING_PAGE_NOT_WORKING, |
243 IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED, | 250 IDS_ERRORPAGES_SUMMARY_CONNECTION_CLOSED, |
244 IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED, | 251 IDS_ERRORPAGES_DETAILS_CONNECTION_CLOSED, |
245 SUGGEST_RELOAD, | 252 SUGGEST_RELOAD, |
246 }, | 253 }, |
247 {net::ERR_SSL_PROTOCOL_ERROR, | 254 {net::ERR_SSL_PROTOCOL_ERROR, |
248 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 255 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
249 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, | 256 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, |
250 IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE, | 257 IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE, |
251 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, | 258 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, |
252 SUGGEST_NONE, | 259 SUGGEST_RELOAD, |
253 }, | 260 }, |
254 {net::ERR_BAD_SSL_CLIENT_AUTH_CERT, | 261 {net::ERR_BAD_SSL_CLIENT_AUTH_CERT, |
255 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 262 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
256 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, | 263 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, |
257 IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT, | 264 IDS_ERRORPAGES_SUMMARY_BAD_SSL_CLIENT_AUTH_CERT, |
258 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT, | 265 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT, |
259 SUGGEST_NONE, | 266 SUGGEST_CONTACT_ADMINISTRATOR_STANDALONE, |
260 }, | 267 }, |
261 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, | 268 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, |
262 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 269 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
263 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, | 270 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, |
264 IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR, | 271 IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR, |
265 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, | 272 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, |
266 SUGGEST_LEARNMORE, | 273 SUGGEST_LEARNMORE, |
267 }, | 274 }, |
268 {net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, | 275 {net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN, |
269 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 276 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
270 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, | 277 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, |
271 IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS, | 278 IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DETAILS, |
272 IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DESCRIPTION, | 279 IDS_CERT_ERROR_SUMMARY_PINNING_FAILURE_DESCRIPTION, |
273 SUGGEST_NONE, | 280 SUGGEST_NONE, |
274 }, | 281 }, |
275 {net::ERR_TEMPORARILY_THROTTLED, | 282 {net::ERR_TEMPORARILY_THROTTLED, |
276 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, | 283 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, |
277 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 284 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
278 IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, | 285 IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, |
279 IDS_ERRORPAGES_DETAILS_TEMPORARILY_THROTTLED, | 286 IDS_ERRORPAGES_DETAILS_TEMPORARILY_THROTTLED, |
280 SUGGEST_NONE, | 287 SUGGEST_DISABLE_EXTENSION, |
281 }, | 288 }, |
282 {net::ERR_BLOCKED_BY_CLIENT, | 289 {net::ERR_BLOCKED_BY_CLIENT, |
283 IDS_ERRORPAGES_TITLE_BLOCKED, | 290 IDS_ERRORPAGES_TITLE_BLOCKED, |
284 IDS_ERRORPAGES_HEADING_BLOCKED, | 291 IDS_ERRORPAGES_HEADING_BLOCKED, |
285 IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_EXTENSION, | 292 IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_EXTENSION, |
286 IDS_ERRORPAGES_DETAILS_BLOCKED_BY_EXTENSION, | 293 IDS_ERRORPAGES_DETAILS_BLOCKED_BY_EXTENSION, |
287 SUGGEST_RELOAD | SUGGEST_DISABLE_EXTENSION, | 294 SUGGEST_RELOAD | SUGGEST_DISABLE_EXTENSION, |
288 }, | 295 }, |
289 {net::ERR_NETWORK_CHANGED, | 296 {net::ERR_NETWORK_CHANGED, |
290 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 297 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
291 IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED, | 298 IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED, |
292 IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED, | 299 IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED, |
293 IDS_ERRORPAGES_DETAILS_NETWORK_CHANGED, | 300 IDS_ERRORPAGES_DETAILS_NETWORK_CHANGED, |
294 SUGGEST_RELOAD | SUGGEST_CHECK_CONNECTION, | 301 SUGGEST_RELOAD, |
295 }, | 302 }, |
296 {net::ERR_BLOCKED_BY_ADMINISTRATOR, | 303 {net::ERR_BLOCKED_BY_ADMINISTRATOR, |
297 IDS_ERRORPAGES_TITLE_BLOCKED, | 304 IDS_ERRORPAGES_TITLE_BLOCKED, |
298 IDS_ERRORPAGES_HEADING_BLOCKED, | 305 IDS_ERRORPAGES_HEADING_BLOCKED, |
299 IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_ADMINISTRATOR, | 306 IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_ADMINISTRATOR, |
300 IDS_ERRORPAGES_DETAILS_BLOCKED_BY_ADMINISTRATOR, | 307 IDS_ERRORPAGES_DETAILS_BLOCKED_BY_ADMINISTRATOR, |
301 SUGGEST_VIEW_POLICIES | SUGGEST_CONTACT_ADMINISTRATOR, | 308 SUGGEST_VIEW_POLICIES | SUGGEST_CONTACT_ADMINISTRATOR_STANDALONE, |
302 }, | 309 }, |
303 {net::ERR_BLOCKED_ENROLLMENT_CHECK_PENDING, | 310 {net::ERR_BLOCKED_ENROLLMENT_CHECK_PENDING, |
304 IDS_ERRORPAGES_TITLE_BLOCKED, | 311 IDS_ERRORPAGES_TITLE_BLOCKED, |
305 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, | 312 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, |
306 IDS_ERRORPAGES_SUMMARY_BLOCKED_ENROLLMENT_CHECK_PENDING, | 313 IDS_ERRORPAGES_SUMMARY_BLOCKED_ENROLLMENT_CHECK_PENDING, |
307 IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING, | 314 IDS_ERRORPAGES_DETAILS_BLOCKED_ENROLLMENT_CHECK_PENDING, |
308 SUGGEST_CHECK_CONNECTION, | 315 SUGGEST_COMPLETE_SETUP, |
309 }, | 316 }, |
310 {net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, | 317 {net::ERR_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, |
311 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 318 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
312 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, | 319 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, |
313 IDS_ERRORPAGES_SUMMARY_SSL_SECURITY_ERROR, | 320 IDS_ERRORPAGES_SUMMARY_INVALID_RESPONSE, |
314 IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, | 321 IDS_ERRORPAGES_DETAILS_SSL_FALLBACK_BEYOND_MINIMUM_VERSION, |
315 SUGGEST_NONE, | 322 SUGGEST_NONE, |
316 }, | 323 }, |
317 {net::ERR_SSL_VERSION_OR_CIPHER_MISMATCH, | 324 {net::ERR_SSL_VERSION_OR_CIPHER_MISMATCH, |
318 IDS_ERRORPAGES_TITLE_LOAD_FAILED, | 325 IDS_ERRORPAGES_TITLE_LOAD_FAILED, |
319 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, | 326 IDS_ERRORPAGES_HEADING_INSECURE_CONNECTION, |
320 IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH, | 327 IDS_ERRORPAGES_SUMMARY_SSL_VERSION_OR_CIPHER_MISMATCH, |
321 IDS_ERRORPAGES_DETAILS_SSL_VERSION_OR_CIPHER_MISMATCH, | 328 IDS_ERRORPAGES_DETAILS_SSL_VERSION_OR_CIPHER_MISMATCH, |
322 SUGGEST_UNSUPPORTED_CIPHER, | 329 SUGGEST_UNSUPPORTED_CIPHER, |
323 }, | 330 }, |
(...skipping 24 matching lines...) Expand all Loading... | |
348 IDS_ERRORPAGES_DETAILS_CACHE_READ_FAILURE, | 355 IDS_ERRORPAGES_DETAILS_CACHE_READ_FAILURE, |
349 SUGGEST_RELOAD, | 356 SUGGEST_RELOAD, |
350 }; | 357 }; |
351 | 358 |
352 const LocalizedErrorMap http_error_options[] = { | 359 const LocalizedErrorMap http_error_options[] = { |
353 {403, | 360 {403, |
354 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, | 361 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, |
355 IDS_ERRORPAGES_HEADING_ACCESS_DENIED, | 362 IDS_ERRORPAGES_HEADING_ACCESS_DENIED, |
356 IDS_ERRORPAGES_SUMMARY_FORBIDDEN, | 363 IDS_ERRORPAGES_SUMMARY_FORBIDDEN, |
357 IDS_ERRORPAGES_DETAILS_FORBIDDEN, | 364 IDS_ERRORPAGES_DETAILS_FORBIDDEN, |
358 SUGGEST_NONE, | 365 SUGGEST_RELOAD, |
359 }, | 366 }, |
360 {410, | 367 {410, |
361 IDS_ERRORPAGES_TITLE_NOT_FOUND, | 368 IDS_ERRORPAGES_TITLE_NOT_FOUND, |
362 IDS_ERRORPAGES_HEADING_NOT_FOUND, | 369 IDS_ERRORPAGES_HEADING_NOT_FOUND, |
363 IDS_ERRORPAGES_SUMMARY_GONE, | 370 IDS_ERRORPAGES_SUMMARY_GONE, |
364 IDS_ERRORPAGES_DETAILS_GONE, | 371 IDS_ERRORPAGES_DETAILS_GONE, |
365 SUGGEST_NONE, | 372 SUGGEST_NONE, |
366 }, | 373 }, |
367 | 374 |
368 {500, | 375 {500, |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
424 }, | 431 }, |
425 | 432 |
426 // DNS_PROBE_FINISHED_UNKNOWN is not here; NetErrorHelper will restore the | 433 // DNS_PROBE_FINISHED_UNKNOWN is not here; NetErrorHelper will restore the |
427 // original error, which might be one of several DNS-related errors. | 434 // original error, which might be one of several DNS-related errors. |
428 | 435 |
429 {error_page::DNS_PROBE_FINISHED_NO_INTERNET, | 436 {error_page::DNS_PROBE_FINISHED_NO_INTERNET, |
430 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 437 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
431 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, | 438 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED, |
432 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED, | 439 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED, |
433 IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED, | 440 IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED, |
434 SUGGEST_CHECK_CONNECTION | SUGGEST_FIREWALL_CONFIG, | 441 SUGGEST_OFFLINE_CHECKS, |
435 }, | 442 }, |
436 {error_page::DNS_PROBE_FINISHED_BAD_CONFIG, | 443 {error_page::DNS_PROBE_FINISHED_BAD_CONFIG, |
437 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 444 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
438 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 445 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
439 IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED, | 446 IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED, |
440 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, | 447 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, |
441 SUGGEST_RELOAD | SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG, | 448 SUGGEST_RELOAD | SUGGEST_DNS_CONFIG | SUGGEST_FIREWALL_CONFIG | |
449 SUGGEST_PROXY_CONFIG, | |
442 }, | 450 }, |
443 {error_page::DNS_PROBE_FINISHED_NXDOMAIN, | 451 {error_page::DNS_PROBE_FINISHED_NXDOMAIN, |
444 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, | 452 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, |
445 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, | 453 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, |
446 IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED, | 454 IDS_ERRORPAGES_SUMMARY_NAME_NOT_RESOLVED, |
447 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, | 455 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, |
448 SUGGEST_RELOAD, | 456 SUGGEST_RELOAD, |
449 }, | 457 }, |
450 }; | 458 }; |
451 | 459 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
504 error_domain == net::kErrorDomain) || | 512 error_domain == net::kErrorDomain) || |
505 (error_code == error_page::DNS_PROBE_FINISHED_NO_INTERNET && | 513 (error_code == error_page::DNS_PROBE_FINISHED_NO_INTERNET && |
506 error_domain == error_page::kDnsProbeErrorDomain)) | 514 error_domain == error_page::kDnsProbeErrorDomain)) |
507 return "icon-offline"; | 515 return "icon-offline"; |
508 | 516 |
509 return "icon-generic"; | 517 return "icon-generic"; |
510 } | 518 } |
511 | 519 |
512 // If the first suggestion is for a Google cache copy link. Promote the | 520 // If the first suggestion is for a Google cache copy link. Promote the |
513 // suggestion to a separate set of strings for displaying as a button. | 521 // suggestion to a separate set of strings for displaying as a button. |
514 void AddGoogleCachedCopyButton(base::ListValue* suggestions, | 522 void AddGoogleCachedCopyButton(base::ListValue* suggestions_summary_list, |
515 base::DictionaryValue* error_strings) { | 523 base::DictionaryValue* error_strings) { |
516 if (!suggestions->empty()) { | 524 if (!suggestions_summary_list->empty()) { |
517 base::DictionaryValue* suggestion; | 525 base::DictionaryValue* suggestion; |
518 suggestions->GetDictionary(0, &suggestion); | 526 suggestions_summary_list->GetDictionary(0, &suggestion); |
519 int type = -1; | 527 int type = -1; |
520 suggestion->GetInteger("type", &type); | 528 suggestion->GetInteger("type", &type); |
521 | 529 |
522 if (type == kGoogleCachedCopySuggestionType) { | 530 if (type == kGoogleCachedCopySuggestionType) { |
523 base::string16 cache_url; | 531 base::string16 cache_url; |
524 suggestion->GetString("urlCorrection", &cache_url); | 532 suggestion->GetString("urlCorrection", &cache_url); |
525 int cache_tracking_id = -1; | 533 int cache_tracking_id = -1; |
526 suggestion->GetInteger("trackingId", &cache_tracking_id); | 534 suggestion->GetInteger("trackingId", &cache_tracking_id); |
527 scoped_ptr<base::DictionaryValue> cache_button(new base::DictionaryValue); | 535 scoped_ptr<base::DictionaryValue> cache_button(new base::DictionaryValue); |
528 cache_button->SetString( | 536 cache_button->SetString( |
529 "msg", | 537 "msg", |
530 l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY)); | 538 l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_SHOW_SAVED_COPY)); |
531 cache_button->SetString("cacheUrl", cache_url); | 539 cache_button->SetString("cacheUrl", cache_url); |
532 cache_button->SetInteger("trackingId", cache_tracking_id); | 540 cache_button->SetInteger("trackingId", cache_tracking_id); |
533 error_strings->Set("cacheButton", cache_button.release()); | 541 error_strings->Set("cacheButton", cache_button.release()); |
534 | 542 |
535 // Remove the item from suggestions dictionary so that it does not get | 543 // Remove the item from suggestions dictionary so that it does not get |
536 // displayed by the template in the details section. | 544 // displayed by the template in the details section. |
537 suggestions->Remove(0, nullptr); | 545 suggestions_summary_list->Remove(0, nullptr); |
538 } | 546 } |
539 } | 547 } |
540 } | 548 } |
541 | 549 |
550 // Helper function that creates a single entry dictionary and adds it | |
551 // to a ListValue, | |
552 void AddSingleEntryDictionaryToList(base::ListValue* list, | |
553 const char* path, | |
554 int message_id, | |
555 bool insert_as_first_item) { | |
556 base::DictionaryValue* suggestion_list_item = new base::DictionaryValue; | |
557 suggestion_list_item->SetString(path, l10n_util::GetStringUTF16(message_id)); | |
558 | |
559 if (insert_as_first_item) | |
560 list->Insert(0, suggestion_list_item); | |
561 else | |
562 list->Append(suggestion_list_item); | |
mmenke
2016/02/22 19:09:41
optional nit: Suggest braces on both clauses here
edwardjung
2016/02/23 14:08:59
Done.
| |
563 } | |
564 | |
565 // Creates a list of suggestions that a user may try to resolve a particular | |
566 // network error. Appears above the fold underneath heading and intro paragraph. | |
567 void GetSuggestionsSummaryList(int error_code, | |
568 base::DictionaryValue* error_strings, | |
569 int suggestions, | |
570 const std::string& locale, | |
571 base::ListValue* suggestions_summary_list) { | |
572 if (suggestions & SUGGEST_CONTACT_ADMINISTRATOR_STANDALONE) { | |
573 DCHECK(suggestions_summary_list->empty()); | |
574 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
575 IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMIN_SUMMARY_WITH_PREFIX, false); | |
576 return; | |
577 } | |
578 | |
579 if (suggestions & SUGGEST_CHECK_CONNECTION) { | |
580 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
581 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_SUMMARY, false); | |
582 } | |
583 | |
584 if ((suggestions & SUGGEST_DNS_CONFIG) && | |
585 (suggestions & SUGGEST_FIREWALL_CONFIG) && | |
586 (suggestions & SUGGEST_PROXY_CONFIG)) { | |
587 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
588 IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_DNS_SUMMARY, false); | |
589 } else if ((suggestions & SUGGEST_FIREWALL_CONFIG) && | |
590 (suggestions & SUGGEST_ANTIVIRUS_CONFIG)) { | |
591 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
592 IDS_ERRORPAGES_SUGGESTION_CHECK_FIREWALL_ANTIVIRUS_SUMMARY, false); | |
593 } else if ((suggestions & SUGGEST_PROXY_CONFIG) && | |
594 (suggestions & SUGGEST_FIREWALL_CONFIG)) { | |
595 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
596 IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_FIREWALL_SUMMARY, false); | |
597 } else if (suggestions & SUGGEST_PROXY_CONFIG) { | |
598 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
599 IDS_ERRORPAGES_SUGGESTION_CHECK_PROXY_ADDRESS_SUMMARY, false); | |
600 } | |
mmenke
2016/02/22 19:09:41
Maybe add:
} else {
DCHECK(!(suggestions & SUGG
edwardjung
2016/02/23 14:09:00
Done.
| |
601 | |
602 if (suggestions & SUGGEST_CONTACT_ADMINISTRATOR) { | |
603 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
604 IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMIN_SUMMARY, false); | |
605 } | |
606 | |
607 if (suggestions & SUGGEST_LEARNMORE) { | |
mmenke
2016/02/22 19:09:41
Should this be the last suggestion?
edwardjung
2016/02/23 14:09:00
Done.
| |
608 GURL learn_more_url; | |
609 base::string16 suggestion_string; | |
610 switch (error_code) { | |
611 case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: | |
612 learn_more_url = GURL(kWeakDHKeyLearnMoreUrl); | |
613 suggestion_string = l10n_util::GetStringUTF16( | |
614 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_SUMMARY); | |
615 break; | |
616 case net::ERR_TOO_MANY_REDIRECTS: | |
617 learn_more_url = GURL(kRedirectLoopLearnMoreUrl); | |
618 suggestion_string = l10n_util::GetStringUTF16( | |
619 IDS_ERRORPAGES_SUGGESTION_CLEAR_COOKIES_SUMMARY); | |
620 break; | |
621 default: | |
mmenke
2016/02/22 19:09:41
NOTREACHED()?
edwardjung
2016/02/23 14:09:00
Done.
| |
622 break; | |
623 } | |
624 | |
625 if (learn_more_url.is_valid()) { | |
mmenke
2016/02/22 19:09:41
I don't think we need this check - generally, the
edwardjung
2016/02/23 14:08:59
Done.
| |
626 // Add the language parameter to the URL. | |
627 std::string query = learn_more_url.query() + "&hl=" + locale; | |
628 GURL::Replacements repl; | |
629 repl.SetQueryStr(query); | |
630 learn_more_url = learn_more_url.ReplaceComponents(repl); | |
631 | |
632 base::DictionaryValue* suggestion_list_item = new base::DictionaryValue; | |
633 suggestion_list_item->SetString("summary", suggestion_string); | |
634 suggestion_list_item->SetString("learnMoreUrl", learn_more_url.spec()); | |
635 suggestions_summary_list->Append(suggestion_list_item); | |
636 } | |
637 } | |
638 | |
639 if (suggestions & SUGGEST_OFFLINE_CHECKS) { | |
640 #if defined(OS_ANDROID) or defined(OS_IOS) | |
641 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
642 IDS_ERRORPAGES_SUGGESTION_TURN_OFF_AIRPLANE_SUMMARY), false; | |
643 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
644 IDS_ERRORPAGES_SUGGESTION_TURN_ON_DATA_SUMMARY, false); | |
645 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
646 IDS_ERRORPAGES_SUGGESTION_CHECKING_SIGNAL_SUMMARY, false); | |
647 #else | |
648 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
649 IDS_ERRORPAGES_SUGGESTION_CHECK_CABLES_SUMMARY, false); | |
650 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
651 IDS_ERRORPAGES_SUGGESTION_RESET_HARDWARE_SUMMARY, false); | |
652 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
653 IDS_ERRORPAGES_SUGGESTION_CHECK_WIFI_SUMMARY, false); | |
654 #endif | |
655 } | |
656 | |
657 if (suggestions & SUGGEST_COMPLETE_SETUP) { | |
mmenke
2016/02/22 19:09:41
These don't mix with other suggestions...Suggest r
edwardjung
2016/02/23 14:09:00
Done.
| |
658 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
659 IDS_ERRORPAGES_SUGGESTION_DIAGNOSE_CONNECTION_SUMMARY, false); | |
660 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
661 IDS_ERRORPAGES_SUGGESTION_DIAGNOSE_CONNECTION_SUMMARY, false); | |
mmenke
2016/02/22 19:09:41
BUG: These two suggestions are the same. I think
edwardjung
2016/02/23 14:09:00
Done.
| |
662 } | |
663 | |
664 if (suggestions & SUGGEST_DISABLE_EXTENSION) { | |
665 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
666 IDS_ERRORPAGES_SUGGESTION_DISABLE_EXTENSION_SUMMARY, false); | |
667 } | |
668 | |
669 // Only add a explicit reload suggestion if there are other suggestions. | |
670 // Otherwise rely on the reload button being used. | |
671 if (!suggestions_summary_list->empty() && suggestions & SUGGEST_RELOAD) { | |
mmenke
2016/02/22 19:09:41
Should we also show this if the page was generated
mmenke
2016/02/22 19:09:41
nit: suggestions & SUGGEST_RELOAD => (suggestions
edwardjung
2016/02/23 14:08:59
Reload with post has a different action. Created a
edwardjung
2016/02/23 14:09:00
Done.
| |
672 AddSingleEntryDictionaryToList(suggestions_summary_list, "summary", | |
673 IDS_ERRORPAGES_SUGGESTION_RELOAD_SUMMARY, true); | |
674 } | |
675 | |
676 // Add list prefix header if there are mulitple suggestions and no suggestion | |
677 // is 'Complete enrollment setup'. | |
678 if (!(suggestions & SUGGEST_COMPLETE_SETUP)) { | |
679 error_strings->SetString("suggestionsSummaryListHeader", | |
680 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_LIST_HEADER)); | |
mmenke
2016/02/22 19:09:41
Fix indent: These should be indented 4 relative t
edwardjung
2016/02/23 14:09:00
Done.
| |
681 } | |
682 } | |
683 | |
684 // Creates a dictionary with "header" and "body" entries and adds it | |
685 // to a ListValue, Returns the dictionary to allow further items to be added. | |
686 base::DictionaryValue* AddSuggestionDetailDictionaryToList( | |
687 base::ListValue* list, | |
688 int header_message_id, | |
689 int body_message_id, | |
690 bool append_standard_menu_items) { | |
mmenke
2016/02/22 19:09:41
Fix indent: These should be indented 4
edwardjung
2016/02/23 14:08:59
Done.
| |
691 base::DictionaryValue* suggestion_list_item; | |
692 if (append_standard_menu_items) | |
693 suggestion_list_item = GetStandardMenuItemsText(); | |
694 else | |
695 suggestion_list_item = new base::DictionaryValue; | |
mmenke
2016/02/22 19:09:41
suggest braces
edwardjung
2016/02/23 14:09:00
Done.
| |
696 | |
697 if (header_message_id) | |
698 suggestion_list_item->SetString("header", | |
699 l10n_util::GetStringUTF16(header_message_id)); | |
mmenke
2016/02/22 19:09:41
Add braces around body of the if
edwardjung
2016/02/23 14:09:00
Done.
| |
700 if (body_message_id) | |
701 suggestion_list_item->SetString("body", | |
702 l10n_util::GetStringUTF16(body_message_id)); | |
mmenke
2016/02/22 19:09:41
Add braces
edwardjung
2016/02/23 14:09:00
Done.
| |
703 list->Append(suggestion_list_item); | |
704 return suggestion_list_item; | |
705 } | |
706 | |
707 // Certain suggestions have supporting details which get displayed under | |
708 // the "Details" button. | |
709 void AddSuggestionsDetails(int error_code, | |
710 base::DictionaryValue* error_strings, | |
711 int suggestions, | |
712 base::ListValue* suggestions_details) { | |
713 if (suggestions & SUGGEST_CHECK_CONNECTION) { | |
714 AddSuggestionDetailDictionaryToList(suggestions_details, | |
715 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER, | |
716 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY, false); | |
717 } | |
718 | |
719 if (suggestions & SUGGEST_DNS_CONFIG) { | |
720 AddSuggestionDetailDictionaryToList(suggestions_details, | |
721 IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER, | |
722 IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_BODY, false); | |
723 | |
724 base::DictionaryValue* suggest_network_prediction = | |
725 AddSuggestionDetailDictionaryToList(suggestions_details, | |
726 IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_HEADER, | |
727 IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY, true); | |
728 | |
729 suggest_network_prediction->SetString( | |
730 "noNetworkPredictionTitle", | |
731 l10n_util::GetStringUTF16( | |
732 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION)); | |
733 } | |
734 | |
735 if (suggestions & SUGGEST_FIREWALL_CONFIG) { | |
736 AddSuggestionDetailDictionaryToList(suggestions_details, | |
737 IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER, | |
738 IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_BODY, false); | |
739 } | |
740 | |
741 if (suggestions & SUGGEST_PROXY_CONFIG) { | |
742 base::DictionaryValue* suggest_proxy_config = | |
743 AddSuggestionDetailDictionaryToList(suggestions_details, | |
744 IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER, | |
745 0, true); | |
746 | |
747 // Custom body string. | |
748 suggest_proxy_config->SetString("body", | |
749 l10n_util::GetStringFUTF16(IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY, | |
750 l10n_util::GetStringUTF16( | |
751 IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM))); | |
752 | |
753 suggest_proxy_config->SetString("proxyTitle", | |
754 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); | |
755 } | |
756 | |
757 if (suggestions & SUGGEST_VIEW_POLICIES) { | |
758 AddSuggestionDetailDictionaryToList(suggestions_details, | |
759 IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_HEADER, | |
760 IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_BODY, false); | |
761 } | |
762 | |
763 if (suggestions & SUGGEST_UNSUPPORTED_CIPHER) { | |
764 AddSuggestionDetailDictionaryToList(suggestions_details, | |
765 IDS_ERRORPAGES_SUGGESTION_UNSUPPORTED_CIPHER_HEADER, | |
766 IDS_ERRORPAGES_SUGGESTION_UNSUPPORTED_CIPHER_BODY, false); | |
767 } | |
768 } | |
769 | |
770 std::string HttpErrorCodeToString(int error) { | |
771 return std::string("HTTP ERROR ") + base::IntToString(error); | |
772 } | |
773 | |
542 } // namespace | 774 } // namespace |
543 | 775 |
544 const char LocalizedError::kHttpErrorDomain[] = "http"; | 776 const char LocalizedError::kHttpErrorDomain[] = "http"; |
545 | 777 |
546 void LocalizedError::GetStrings(int error_code, | 778 void LocalizedError::GetStrings(int error_code, |
547 const std::string& error_domain, | 779 const std::string& error_domain, |
548 const GURL& failed_url, | 780 const GURL& failed_url, |
549 bool is_post, | 781 bool is_post, |
550 bool stale_copy_in_cache, | 782 bool stale_copy_in_cache, |
551 bool can_show_network_diagnostics_dialog, | 783 bool can_show_network_diagnostics_dialog, |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
644 base::string16 error_string; | 876 base::string16 error_string; |
645 if (error_domain == net::kErrorDomain) { | 877 if (error_domain == net::kErrorDomain) { |
646 // Non-internationalized error string, for debugging Chrome itself. | 878 // Non-internationalized error string, for debugging Chrome itself. |
647 error_string = base::ASCIIToUTF16(net::ErrorToShortString(error_code)); | 879 error_string = base::ASCIIToUTF16(net::ErrorToShortString(error_code)); |
648 } else if (error_domain == error_page::kDnsProbeErrorDomain) { | 880 } else if (error_domain == error_page::kDnsProbeErrorDomain) { |
649 std::string ascii_error_string = | 881 std::string ascii_error_string = |
650 error_page::DnsProbeStatusToString(error_code); | 882 error_page::DnsProbeStatusToString(error_code); |
651 error_string = base::ASCIIToUTF16(ascii_error_string); | 883 error_string = base::ASCIIToUTF16(ascii_error_string); |
652 } else { | 884 } else { |
653 DCHECK_EQ(LocalizedError::kHttpErrorDomain, error_domain); | 885 DCHECK_EQ(LocalizedError::kHttpErrorDomain, error_domain); |
654 error_string = base::IntToString16(error_code); | 886 error_string = base::ASCIIToUTF16(HttpErrorCodeToString(error_code)); |
655 } | 887 } |
656 error_strings->SetString("errorCode", error_string); | 888 error_strings->SetString("errorCode", error_string); |
657 | 889 |
658 // Platform specific information for diagnosing network issues on OSX and | 890 // Platform specific information for diagnosing network issues on OSX and |
659 // Windows. | 891 // Windows. |
660 #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) | 892 #if (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) |
661 if (error_domain == net::kErrorDomain && | 893 if (error_domain == net::kErrorDomain && |
662 error_code == net::ERR_INTERNET_DISCONNECTED) { | 894 error_code == net::ERR_INTERNET_DISCONNECTED) { |
663 int platform_string_id = | 895 int platform_string_id = |
664 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM; | 896 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED_PLATFORM; |
(...skipping 17 matching lines...) Expand all Loading... | |
682 l10n_util::GetStringUTF16(platform_string_id))); | 914 l10n_util::GetStringUTF16(platform_string_id))); |
683 } | 915 } |
684 #endif // (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) | 916 #endif // (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_WIN) |
685 | 917 |
686 // If no parameters were provided, use the defaults. | 918 // If no parameters were provided, use the defaults. |
687 if (!params) { | 919 if (!params) { |
688 params.reset(new error_page::ErrorPageParams()); | 920 params.reset(new error_page::ErrorPageParams()); |
689 params->suggest_reload = !!(options.suggestions & SUGGEST_RELOAD); | 921 params->suggest_reload = !!(options.suggestions & SUGGEST_RELOAD); |
690 } | 922 } |
691 | 923 |
692 base::ListValue* suggestions = NULL; | 924 base::ListValue* suggestions_details = NULL; |
925 base::ListValue* suggestions_summary_list = NULL; | |
mmenke
2016/02/22 19:09:41
NULL -> nullptr (x2)? Not worth going around and
edwardjung
2016/02/23 14:09:00
Done.
| |
926 | |
693 bool use_default_suggestions = true; | 927 bool use_default_suggestions = true; |
694 if (!params->override_suggestions) { | 928 if (!params->override_suggestions) { |
695 suggestions = new base::ListValue(); | 929 suggestions_details = new base::ListValue(); |
930 suggestions_summary_list = new base::ListValue(); | |
931 // Detailed suggestion information. | |
932 error_strings->Set("suggestionsDetails", suggestions_details); | |
696 } else { | 933 } else { |
697 suggestions = params->override_suggestions.release(); | 934 suggestions_summary_list = params->override_suggestions.release(); |
698 use_default_suggestions = false; | 935 use_default_suggestions = false; |
699 AddGoogleCachedCopyButton(suggestions, error_strings); | 936 AddGoogleCachedCopyButton(suggestions_summary_list, error_strings); |
700 } | 937 } |
701 error_strings->Set("suggestions", suggestions); | 938 error_strings->Set("suggestionsSummaryList", suggestions_summary_list); |
702 | 939 |
703 if (params->search_url.is_valid()) { | 940 if (params->search_url.is_valid()) { |
704 error_strings->SetString("searchHeader", | 941 base::DictionaryValue* search_suggestion = new base::DictionaryValue; |
705 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_GOOGLE_SEARCH)); | 942 search_suggestion->SetString("summary",l10n_util::GetStringUTF16( |
706 error_strings->SetString("searchUrl", params->search_url.spec()); | 943 IDS_ERRORPAGES_SUGGESTION_GOOGLE_SEARCH_SUMMARY)); |
707 error_strings->SetString("searchTerms", params->search_terms); | 944 search_suggestion->SetString("searchUrl", params->search_url.spec() + |
708 error_strings->SetInteger("searchTrackingId", params->search_tracking_id); | 945 params->search_terms); |
946 search_suggestion->SetString("searchTerms", params->search_terms); | |
947 search_suggestion->SetInteger("trackingId", | |
948 params->search_tracking_id); | |
949 suggestions_summary_list->Append(search_suggestion); | |
709 } | 950 } |
710 | 951 |
711 // Add the reload suggestion, if needed. | 952 // Add the reload suggestion, if needed. |
712 if (params->suggest_reload) { | 953 if (params->suggest_reload) { |
713 if (!is_post) { | 954 if (!is_post) { |
714 base::DictionaryValue* reload_button = new base::DictionaryValue; | 955 base::DictionaryValue* reload_button = new base::DictionaryValue; |
715 reload_button->SetString( | 956 reload_button->SetString( |
716 "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD)); | 957 "msg", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_RELOAD)); |
717 reload_button->SetString("reloadUrl", failed_url.spec()); | 958 reload_button->SetString("reloadUrl", failed_url.spec()); |
718 error_strings->Set("reloadButton", reload_button); | 959 error_strings->Set("reloadButton", reload_button); |
719 reload_button->SetInteger("reloadTrackingId", params->reload_tracking_id); | 960 reload_button->SetInteger("reloadTrackingId", params->reload_tracking_id); |
720 } else { | 961 } else { |
721 // If the page was created by a post, it can't be reloaded in the same | 962 // If the page was created by a post, it can't be reloaded in the same |
722 // way, so just add a suggestion instead. | 963 // way, so just add a suggestion instead. |
723 // TODO(mmenke): Make the reload button bring up the repost confirmation | 964 // TODO(mmenke): Make the reload button bring up the repost confirmation |
724 // dialog for pages resulting from posts. | 965 // dialog for pages resulting from posts. |
725 base::DictionaryValue* suggest_reload_repost = new base::DictionaryValue; | 966 base::DictionaryValue* suggest_reload_repost = new base::DictionaryValue; |
726 suggest_reload_repost->SetString("header", | 967 suggest_reload_repost->SetString("summary", |
727 l10n_util::GetStringUTF16( | 968 l10n_util::GetStringUTF16( |
728 IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_HEADER)); | 969 IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_SUMMARY)); |
729 suggest_reload_repost->SetString("body", | 970 |
730 l10n_util::GetStringUTF16( | |
731 IDS_ERRORPAGES_SUGGESTION_RELOAD_REPOST_BODY)); | |
732 // Add at the front, so it appears before other suggestions, in the case | 971 // Add at the front, so it appears before other suggestions, in the case |
733 // suggestions are being overridden by |params|. | 972 // suggestions are being overridden by |params|. |
734 suggestions->Insert(0, suggest_reload_repost); | 973 suggestions_summary_list->Insert(0, suggest_reload_repost); |
735 } | 974 } |
736 } | 975 } |
737 | 976 |
738 // If not using the default suggestions, nothing else to do. | 977 // If not using the default suggestions, nothing else to do. |
739 if (!use_default_suggestions) | 978 if (!use_default_suggestions) |
740 return; | 979 return; |
741 | 980 |
981 // Add default suggestions and any relevant supporting details. | |
982 GetSuggestionsSummaryList(error_code, error_strings, options.suggestions, | |
983 locale, suggestions_summary_list); | |
984 AddSuggestionsDetails(error_code, error_strings, options.suggestions, | |
985 suggestions_details); | |
986 | |
987 // Add action buttons. | |
742 const std::string& show_saved_copy_value = | 988 const std::string& show_saved_copy_value = |
743 command_line->GetSwitchValueASCII(error_page::switches::kShowSavedCopy); | 989 command_line->GetSwitchValueASCII(error_page::switches::kShowSavedCopy); |
744 bool show_saved_copy_primary = | 990 bool show_saved_copy_primary = |
745 (show_saved_copy_value == | 991 (show_saved_copy_value == |
746 error_page::switches::kEnableShowSavedCopyPrimary); | 992 error_page::switches::kEnableShowSavedCopyPrimary); |
747 bool show_saved_copy_secondary = | 993 bool show_saved_copy_secondary = |
748 (show_saved_copy_value == | 994 (show_saved_copy_value == |
749 error_page::switches::kEnableShowSavedCopySecondary); | 995 error_page::switches::kEnableShowSavedCopySecondary); |
750 bool show_saved_copy_visible = | 996 bool show_saved_copy_visible = |
751 (stale_copy_in_cache && !is_post && | 997 (stale_copy_in_cache && !is_post && |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
793 #if defined(OS_CHROMEOS) | 1039 #if defined(OS_CHROMEOS) |
794 // ChromeOS has its own diagnostics extension, which doesn't rely on a | 1040 // ChromeOS has its own diagnostics extension, which doesn't rely on a |
795 // browser-initiated dialog. | 1041 // browser-initiated dialog. |
796 can_show_network_diagnostics_dialog = true; | 1042 can_show_network_diagnostics_dialog = true; |
797 #endif | 1043 #endif |
798 if (can_show_network_diagnostics_dialog && failed_url.is_valid() && | 1044 if (can_show_network_diagnostics_dialog && failed_url.is_valid() && |
799 failed_url.SchemeIsHTTPOrHTTPS()) { | 1045 failed_url.SchemeIsHTTPOrHTTPS()) { |
800 error_strings->SetString( | 1046 error_strings->SetString( |
801 "diagnose", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_DIAGNOSE)); | 1047 "diagnose", l10n_util::GetStringUTF16(IDS_ERRORPAGES_BUTTON_DIAGNOSE)); |
802 } | 1048 } |
803 | |
804 if (options.suggestions & SUGGEST_CHECK_CONNECTION) { | |
805 base::DictionaryValue* suggest_check_connection = new base::DictionaryValue; | |
806 suggest_check_connection->SetString("header", | |
807 l10n_util::GetStringUTF16( | |
808 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_HEADER)); | |
809 suggest_check_connection->SetString("body", | |
810 l10n_util::GetStringUTF16( | |
811 IDS_ERRORPAGES_SUGGESTION_CHECK_CONNECTION_BODY)); | |
812 suggestions->Append(suggest_check_connection); | |
813 } | |
814 | |
815 if (options.suggestions & SUGGEST_DNS_CONFIG) { | |
816 base::DictionaryValue* suggest_dns_config = new base::DictionaryValue; | |
817 suggest_dns_config->SetString("header", | |
818 l10n_util::GetStringUTF16( | |
819 IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_HEADER)); | |
820 suggest_dns_config->SetString("body", | |
821 l10n_util::GetStringUTF16( | |
822 IDS_ERRORPAGES_SUGGESTION_DNS_CONFIG_BODY)); | |
823 suggestions->Append(suggest_dns_config); | |
824 | |
825 base::DictionaryValue* suggest_network_prediction = | |
826 GetStandardMenuItemsText(); | |
827 suggest_network_prediction->SetString("header", | |
828 l10n_util::GetStringUTF16( | |
829 IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_HEADER)); | |
830 suggest_network_prediction->SetString("body", | |
831 l10n_util::GetStringUTF16( | |
832 IDS_ERRORPAGES_SUGGESTION_NETWORK_PREDICTION_BODY)); | |
833 suggest_network_prediction->SetString( | |
834 "noNetworkPredictionTitle", | |
835 l10n_util::GetStringUTF16( | |
836 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION)); | |
837 suggestions->Append(suggest_network_prediction); | |
838 } | |
839 | |
840 // TODO(crbug.com/584615): Does it make sense to show all of these | |
841 // suggestions on mobile? Several of them seem irrelevant in the mobile | |
842 // context. | |
843 if (options.suggestions & SUGGEST_FIREWALL_CONFIG) { | |
844 base::DictionaryValue* suggest_firewall_config = new base::DictionaryValue; | |
845 suggest_firewall_config->SetString("header", | |
846 l10n_util::GetStringUTF16( | |
847 IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_HEADER)); | |
848 suggest_firewall_config->SetString("body", | |
849 l10n_util::GetStringUTF16( | |
850 IDS_ERRORPAGES_SUGGESTION_FIREWALL_CONFIG_BODY)); | |
851 suggestions->Append(suggest_firewall_config); | |
852 } | |
853 | |
854 if (options.suggestions & SUGGEST_PROXY_CONFIG) { | |
855 base::DictionaryValue* suggest_proxy_config = GetStandardMenuItemsText(); | |
856 suggest_proxy_config->SetString("header", | |
857 l10n_util::GetStringUTF16( | |
858 IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_HEADER)); | |
859 suggest_proxy_config->SetString("body", | |
860 l10n_util::GetStringFUTF16(IDS_ERRORPAGES_SUGGESTION_PROXY_CONFIG_BODY, | |
861 l10n_util::GetStringUTF16( | |
862 IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM))); | |
863 suggest_proxy_config->SetString("proxyTitle", | |
864 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); | |
865 | |
866 suggestions->Append(suggest_proxy_config); | |
867 } | |
868 | |
869 if (options.suggestions & SUGGEST_DISABLE_EXTENSION) { | |
870 base::DictionaryValue* suggest_disable_extension = | |
871 new base::DictionaryValue; | |
872 // There's only a header for this suggestion. | |
873 suggest_disable_extension->SetString("header", | |
874 l10n_util::GetStringUTF16( | |
875 IDS_ERRORPAGES_SUGGESTION_DISABLE_EXTENSION_HEADER)); | |
876 suggestions->Append(suggest_disable_extension); | |
877 } | |
878 | |
879 if (options.suggestions & SUGGEST_VIEW_POLICIES) { | |
880 base::DictionaryValue* suggest_view_policies = new base::DictionaryValue; | |
881 suggest_view_policies->SetString( | |
882 "header", | |
883 l10n_util::GetStringUTF16( | |
884 IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_HEADER)); | |
885 suggest_view_policies->SetString( | |
886 "body", | |
887 l10n_util::GetStringUTF16( | |
888 IDS_ERRORPAGES_SUGGESTION_VIEW_POLICIES_BODY)); | |
889 suggestions->Append(suggest_view_policies); | |
890 } | |
891 | |
892 if (options.suggestions & SUGGEST_CONTACT_ADMINISTRATOR) { | |
893 base::DictionaryValue* suggest_contant_administrator = | |
894 new base::DictionaryValue; | |
895 suggest_contant_administrator->SetString( | |
896 "body", | |
897 l10n_util::GetStringUTF16( | |
898 IDS_ERRORPAGES_SUGGESTION_CONTACT_ADMINISTRATOR_BODY)); | |
899 suggestions->Append(suggest_contant_administrator); | |
900 } | |
901 | |
902 if (options.suggestions & SUGGEST_LEARNMORE) { | |
903 GURL learn_more_url; | |
904 switch (options.error_code) { | |
905 case net::ERR_TOO_MANY_REDIRECTS: | |
906 learn_more_url = GURL(kRedirectLoopLearnMoreUrl); | |
907 break; | |
908 case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY: | |
909 learn_more_url = GURL(kWeakDHKeyLearnMoreUrl); | |
910 break; | |
911 default: | |
912 break; | |
913 } | |
914 | |
915 if (learn_more_url.is_valid()) { | |
916 // Add the language parameter to the URL. | |
917 std::string query = learn_more_url.query() + "&hl=" + locale; | |
918 GURL::Replacements repl; | |
919 repl.SetQueryStr(query); | |
920 learn_more_url = learn_more_url.ReplaceComponents(repl); | |
921 | |
922 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue; | |
923 // There's only a body for this suggestion. | |
924 suggest_learn_more->SetString("body", | |
925 l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY)); | |
926 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); | |
927 suggestions->Append(suggest_learn_more); | |
928 } | |
929 } | |
930 | |
931 if (options.suggestions & SUGGEST_UNSUPPORTED_CIPHER) { | |
932 base::DictionaryValue* suggest_unsupported_cipher = | |
933 new base::DictionaryValue; | |
934 suggest_unsupported_cipher->SetString( | |
935 "body", | |
936 l10n_util::GetStringUTF16( | |
937 IDS_ERRORPAGES_SUGGESTION_UNSUPPORTED_CIPHER)); | |
938 suggestions->Append(suggest_unsupported_cipher); | |
939 } | |
940 } | 1049 } |
941 | 1050 |
942 base::string16 LocalizedError::GetErrorDetails(const std::string& error_domain, | 1051 base::string16 LocalizedError::GetErrorDetails(const std::string& error_domain, |
943 int error_code, | 1052 int error_code, |
944 bool is_post) { | 1053 bool is_post) { |
945 const LocalizedErrorMap* error_map = | 1054 const LocalizedErrorMap* error_map = |
946 LookupErrorMap(error_domain, error_code, is_post); | 1055 LookupErrorMap(error_domain, error_code, is_post); |
947 if (error_map) | 1056 if (error_map) |
948 return l10n_util::GetStringUTF16(error_map->details_resource_id); | 1057 return l10n_util::GetStringUTF16(error_map->details_resource_id); |
949 else | 1058 else |
950 return l10n_util::GetStringUTF16(IDS_ERRORPAGES_DETAILS_UNKNOWN); | 1059 return l10n_util::GetStringUTF16(IDS_ERRORPAGES_DETAILS_UNKNOWN); |
951 } | 1060 } |
952 | 1061 |
953 bool LocalizedError::HasStrings(const std::string& error_domain, | 1062 bool LocalizedError::HasStrings(const std::string& error_domain, |
954 int error_code) { | 1063 int error_code) { |
955 // Whether or not the there are strings for an error does not depend on | 1064 // Whether or not the there are strings for an error does not depend on |
956 // whether or not the page was be generated by a POST, so just claim it was | 1065 // whether or not the page was be generated by a POST, so just claim it was |
957 // not. | 1066 // not. |
958 return LookupErrorMap(error_domain, error_code, /*is_post=*/false) != NULL; | 1067 return LookupErrorMap(error_domain, error_code, /*is_post=*/false) != NULL; |
959 } | 1068 } |
960 | 1069 |
961 } // namespace error_page | 1070 } // namespace error_page |
OLD | NEW |