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

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

Issue 387020: Upstreaming WebKit.gyp (Closed)
Patch Set: Created 11 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
« no previous file with comments | « chrome/renderer/loadtimes_extension_bindings.cc ('k') | chrome/renderer/navigation_state.h » ('j') | 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/logging.h" 8 #include "base/logging.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "googleurl/src/gurl.h" 11 #include "googleurl/src/gurl.h"
12 #include "grit/generated_resources.h" 12 #include "grit/generated_resources.h"
13 #include "net/base/escape.h" 13 #include "net/base/escape.h"
14 #include "net/base/net_errors.h" 14 #include "net/base/net_errors.h"
15 #include "webkit/api/public/WebURLError.h" 15 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
16 #include "webkit/glue/webkit_glue.h" 16 #include "webkit/glue/webkit_glue.h"
17 17
18 using WebKit::WebURLError; 18 using WebKit::WebURLError;
19 19
20 namespace { 20 namespace {
21 21
22 static const char* kRedirectLoopLearnMoreUrl = 22 static const char* kRedirectLoopLearnMoreUrl =
23 "http://www.google.com/support/chrome/bin/answer.py?answer=95626"; 23 "http://www.google.com/support/chrome/bin/answer.py?answer=95626";
24 24
25 enum NAV_SUGGESTIONS { 25 enum NAV_SUGGESTIONS {
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 L"title", l10n_util::GetStringF(IDS_ERRORPAGES_TITLE_NOT_AVAILABLE, 217 L"title", l10n_util::GetStringF(IDS_ERRORPAGES_TITLE_NOT_AVAILABLE,
218 failed_url.c_str())); 218 failed_url.c_str()));
219 error_strings->SetString(L"heading", 219 error_strings->SetString(L"heading",
220 l10n_util::GetString(IDS_HTTP_POST_WARNING_TITLE)); 220 l10n_util::GetString(IDS_HTTP_POST_WARNING_TITLE));
221 error_strings->SetString(L"suggestionsHeading", L""); 221 error_strings->SetString(L"suggestionsHeading", L"");
222 DictionaryValue* summary = new DictionaryValue; 222 DictionaryValue* summary = new DictionaryValue;
223 summary->SetString(L"msg", 223 summary->SetString(L"msg",
224 l10n_util::GetString(IDS_ERRORPAGES_HTTP_POST_WARNING)); 224 l10n_util::GetString(IDS_ERRORPAGES_HTTP_POST_WARNING));
225 error_strings->Set(L"summary", summary); 225 error_strings->Set(L"summary", summary);
226 } 226 }
OLDNEW
« no previous file with comments | « chrome/renderer/loadtimes_extension_bindings.cc ('k') | chrome/renderer/navigation_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698