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

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

Issue 8784004: Update includes to new header locations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/common/extensions/extension_set.h" 13 #include "chrome/common/extensions/extension_set.h"
14 #include "content/public/renderer/render_thread.h" 14 #include "content/public/renderer/render_thread.h"
15 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
16 #include "grit/chromium_strings.h" 16 #include "grit/chromium_strings.h"
17 #include "grit/generated_resources.h" 17 #include "grit/generated_resources.h"
18 #include "net/base/escape.h" 18 #include "net/base/escape.h"
19 #include "net/base/net_errors.h" 19 #include "net/base/net_errors.h"
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"
21 #include "ui/base/l10n/l10n_util.h" 21 #include "ui/base/l10n/l10n_util.h"
22 #include "webkit/glue/webkit_glue.h" 22 #include "webkit/glue/webkit_glue.h"
23 23
24 #if defined(OS_WIN) 24 #if defined(OS_WIN)
25 #include "base/win/windows_version.h" 25 #include "base/win/windows_version.h"
26 #endif 26 #endif
27 27
28 using WebKit::WebURLError; 28 using WebKit::WebURLError;
29 using content::RenderThread; 29 using content::RenderThread;
30 30
(...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 failed_url.c_str())); 699 failed_url.c_str()));
700 700
701 error_strings->SetString("title", app->name()); 701 error_strings->SetString("title", app->name());
702 error_strings->SetString("icon", 702 error_strings->SetString("icon",
703 app->GetIconURL(Extension::EXTENSION_ICON_LARGE, 703 app->GetIconURL(Extension::EXTENSION_ICON_LARGE,
704 ExtensionIconSet::MATCH_SMALLER).spec()); 704 ExtensionIconSet::MATCH_SMALLER).spec());
705 error_strings->SetString("name", app->name()); 705 error_strings->SetString("name", app->name());
706 error_strings->SetString("msg", 706 error_strings->SetString("msg",
707 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING)); 707 l10n_util::GetStringUTF16(IDS_ERRORPAGES_APP_WARNING));
708 } 708 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698