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

Side by Side Diff: chrome/renderer/localized_error.cc

Issue 4182012: Adds error text for the ERR_NETWORK_ACCESS_DENIED error,... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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 | « chrome/app/generated_resources.grd ('k') | 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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/renderer/localized_error.h" 5 #include "chrome/renderer/localized_error.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string16.h" 10 #include "base/string16.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 IDS_ERRORPAGES_DETAILS_CONNECT_FAILED, 72 IDS_ERRORPAGES_DETAILS_CONNECT_FAILED,
73 SUGGEST_RELOAD, 73 SUGGEST_RELOAD,
74 }, 74 },
75 {net::ERR_NAME_NOT_RESOLVED, 75 {net::ERR_NAME_NOT_RESOLVED,
76 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, 76 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
77 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE, 77 IDS_ERRORPAGES_HEADING_NOT_AVAILABLE,
78 IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE, 78 IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE,
79 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED, 79 IDS_ERRORPAGES_DETAILS_NAME_NOT_RESOLVED,
80 SUGGEST_RELOAD, 80 SUGGEST_RELOAD,
81 }, 81 },
82 {net::ERR_NETWORK_ACCESS_DENIED,
83 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
84 IDS_ERRORPAGES_HEADING_NETWORK_ACCESS_DENIED,
85 IDS_ERRORPAGES_SUMMARY_NETWORK_ACCESS_DENIED,
86 IDS_ERRORPAGES_DETAILS_NETWORK_ACCESS_DENIED,
87 SUGGEST_NONE,
88 },
89 {net::ERR_PROXY_CONNECTION_FAILED,
90 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
91 IDS_ERRORPAGES_HEADING_PROXY_CONNECTION_FAILED,
92 IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED,
93 IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED,
94 SUGGEST_NONE,
95 },
96 {net::ERR_INTERNET_DISCONNECTED,
97 IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
98 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
99 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED,
100 IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED,
101 SUGGEST_NONE,
102 },
82 {net::ERR_FILE_NOT_FOUND, 103 {net::ERR_FILE_NOT_FOUND,
83 IDS_ERRORPAGES_TITLE_NOT_FOUND, 104 IDS_ERRORPAGES_TITLE_NOT_FOUND,
84 IDS_ERRORPAGES_HEADING_NOT_FOUND, 105 IDS_ERRORPAGES_HEADING_NOT_FOUND,
85 IDS_ERRORPAGES_SUMMARY_NOT_FOUND, 106 IDS_ERRORPAGES_SUMMARY_NOT_FOUND,
86 IDS_ERRORPAGES_DETAILS_FILE_NOT_FOUND, 107 IDS_ERRORPAGES_DETAILS_FILE_NOT_FOUND,
87 SUGGEST_NONE, 108 SUGGEST_NONE,
88 }, 109 },
89 {net::ERR_TOO_MANY_REDIRECTS, 110 {net::ERR_TOO_MANY_REDIRECTS,
90 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 111 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
91 IDS_ERRORPAGES_HEADING_TOO_MANY_REDIRECTS, 112 IDS_ERRORPAGES_HEADING_TOO_MANY_REDIRECTS,
(...skipping 22 matching lines...) Expand all
114 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT, 135 IDS_ERRORPAGES_DETAILS_BAD_SSL_CLIENT_AUTH_CERT,
115 SUGGEST_NONE, 136 SUGGEST_NONE,
116 }, 137 },
117 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY, 138 {net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY,
118 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 139 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
119 IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY, 140 IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY,
120 IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY, 141 IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY,
121 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, 142 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
122 SUGGEST_LEARNMORE, 143 SUGGEST_LEARNMORE,
123 }, 144 },
124 {net::ERR_PROXY_CONNECTION_FAILED,
125 IDS_ERRORPAGES_TITLE_PROXY_CONNECTION_FAILED,
126 IDS_ERRORPAGES_HEADING_PROXY_CONNECTION_FAILED,
127 IDS_ERRORPAGES_SUMMARY_PROXY_CONNECTION_FAILED,
128 IDS_ERRORPAGES_DETAILS_PROXY_CONNECTION_FAILED,
129 SUGGEST_NONE,
130 },
131 {net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION, 145 {net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
132 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 146 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
133 IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION, 147 IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
134 IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION, 148 IDS_ERRORPAGES_SUMMARY_ESET_ANTI_VIRUS_SSL_INTERCEPTION,
135 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, 149 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
136 SUGGEST_LEARNMORE, 150 SUGGEST_LEARNMORE,
137 }, 151 },
138 {net::ERR_NETNANNY_SSL_INTERCEPTION, 152 {net::ERR_NETNANNY_SSL_INTERCEPTION,
139 IDS_ERRORPAGES_TITLE_LOAD_FAILED, 153 IDS_ERRORPAGES_TITLE_LOAD_FAILED,
140 IDS_ERRORPAGES_HEADING_NETNANNY_SSL_INTERCEPTION, 154 IDS_ERRORPAGES_HEADING_NETNANNY_SSL_INTERCEPTION,
141 IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION, 155 IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION,
142 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, 156 IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR,
143 SUGGEST_LEARNMORE, 157 SUGGEST_LEARNMORE,
144 }, 158 },
145 {net::ERR_INTERNET_DISCONNECTED,
146 IDS_ERRORPAGES_TITLE_INTERNET_DISCONNECTED,
147 IDS_ERRORPAGES_HEADING_INTERNET_DISCONNECTED,
148 IDS_ERRORPAGES_SUMMARY_INTERNET_DISCONNECTED,
149 IDS_ERRORPAGES_DETAILS_INTERNET_DISCONNECTED,
150 SUGGEST_NONE,
151 },
152 }; 159 };
153 160
154 const LocalizedErrorMap http_error_options[] = { 161 const LocalizedErrorMap http_error_options[] = {
155 {403, 162 {403,
156 IDS_ERRORPAGES_TITLE_ACCESS_DENIED, 163 IDS_ERRORPAGES_TITLE_ACCESS_DENIED,
157 IDS_ERRORPAGES_HEADING_ACCESS_DENIED, 164 IDS_ERRORPAGES_HEADING_ACCESS_DENIED,
158 IDS_ERRORPAGES_SUMMARY_FORBIDDEN, 165 IDS_ERRORPAGES_SUMMARY_FORBIDDEN,
159 IDS_ERRORPAGES_DETAILS_FORBIDDEN, 166 IDS_ERRORPAGES_DETAILS_FORBIDDEN,
160 SUGGEST_NONE, 167 SUGGEST_NONE,
161 }, 168 },
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 error_strings->SetString( 510 error_strings->SetString(
504 "url", l10n_util::GetStringFUTF16(IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, 511 "url", l10n_util::GetStringFUTF16(IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
505 failed_url.c_str())); 512 failed_url.c_str()));
506 513
507 error_strings->SetString("title", app->name()); 514 error_strings->SetString("title", app->name());
508 error_strings->SetString("icon", app->icon_url().spec()); 515 error_strings->SetString("icon", app->icon_url().spec());
509 error_strings->SetString("name", app->name()); 516 error_strings->SetString("name", app->name());
510 error_strings->SetString("msg", 517 error_strings->SetString("msg",
511 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING)); 518 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING));
512 } 519 }
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698