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

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

Issue 450053003: Use a qualified path for grit includes in various chrome/ directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove webkit strings that no longer exist Created 6 years, 4 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
OLDNEW
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 "chrome/common/localized_error.h" 5 #include "chrome/common/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/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "base/values.h" 13 #include "base/values.h"
14 #include "chrome/common/net/net_error_info.h" 14 #include "chrome/common/net/net_error_info.h"
15 #include "chrome/grit/chromium_strings.h"
16 #include "chrome/grit/generated_resources.h"
15 #include "extensions/common/constants.h" 17 #include "extensions/common/constants.h"
16 #include "extensions/common/extension_icon_set.h" 18 #include "extensions/common/extension_icon_set.h"
17 #include "extensions/common/manifest_handlers/icons_handler.h" 19 #include "extensions/common/manifest_handlers/icons_handler.h"
18 #include "grit/chromium_strings.h"
19 #include "grit/generated_resources.h"
20 #include "net/base/escape.h" 20 #include "net/base/escape.h"
21 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
22 #include "net/base/net_util.h" 22 #include "net/base/net_util.h"
23 #include "third_party/WebKit/public/platform/WebURLError.h" 23 #include "third_party/WebKit/public/platform/WebURLError.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/webui/web_ui_util.h" 25 #include "ui/base/webui/web_ui_util.h"
26 26
27 #if defined(OS_WIN) 27 #if defined(OS_WIN)
28 #include "base/win/windows_version.h" 28 #include "base/win/windows_version.h"
29 #endif 29 #endif
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
867 #if defined(OS_CHROMEOS) 867 #if defined(OS_CHROMEOS)
868 GURL learn_more_url(kAppWarningLearnMoreUrl); 868 GURL learn_more_url(kAppWarningLearnMoreUrl);
869 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue(); 869 base::DictionaryValue* suggest_learn_more = new base::DictionaryValue();
870 suggest_learn_more->SetString("msg", 870 suggest_learn_more->SetString("msg",
871 l10n_util::GetStringUTF16( 871 l10n_util::GetStringUTF16(
872 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY)); 872 IDS_ERRORPAGES_SUGGESTION_LEARNMORE_BODY));
873 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec()); 873 suggest_learn_more->SetString("learnMoreUrl", learn_more_url.spec());
874 error_strings->Set("suggestionsLearnMore", suggest_learn_more); 874 error_strings->Set("suggestionsLearnMore", suggest_learn_more);
875 #endif // defined(OS_CHROMEOS) 875 #endif // defined(OS_CHROMEOS)
876 } 876 }
OLDNEW
« no previous file with comments | « chrome/common/importer/firefox_importer_utils_unittest.cc ('k') | chrome/common/net/net_resource_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698