OLD | NEW |
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/browser/ui/webui/conflicts_ui.h" | 5 #include "chrome/browser/ui/webui/conflicts_ui.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 27 matching lines...) Expand all Loading... |
38 new ChromeWebUIDataSource(chrome::kChromeUIConflictsHost); | 38 new ChromeWebUIDataSource(chrome::kChromeUIConflictsHost); |
39 | 39 |
40 source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE); | 40 source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE); |
41 source->AddLocalizedString("modulesLongTitle", | 41 source->AddLocalizedString("modulesLongTitle", |
42 IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG); | 42 IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG); |
43 source->AddLocalizedString("modulesBlurb", IDS_CONFLICTS_EXPLANATION_TEXT); | 43 source->AddLocalizedString("modulesBlurb", IDS_CONFLICTS_EXPLANATION_TEXT); |
44 source->AddLocalizedString("moduleSuspectedBad", | 44 source->AddLocalizedString("moduleSuspectedBad", |
45 IDS_CONFLICTS_CHECK_WARNING_SUSPECTED); | 45 IDS_CONFLICTS_CHECK_WARNING_SUSPECTED); |
46 source->AddLocalizedString("moduleConfirmedBad", | 46 source->AddLocalizedString("moduleConfirmedBad", |
47 IDS_CONFLICTS_CHECK_WARNING_CONFIRMED); | 47 IDS_CONFLICTS_CHECK_WARNING_CONFIRMED); |
48 source->AddLocalizedString("helpCenterLink", IDS_CONFLICTS_HELP_CENTER_LINK); | 48 source->AddLocalizedString("helpCenterLink", IDS_LEARN_MORE); |
49 source->AddLocalizedString("investigatingText", | 49 source->AddLocalizedString("investigatingText", |
50 IDS_CONFLICTS_CHECK_INVESTIGATING); | 50 IDS_CONFLICTS_CHECK_INVESTIGATING); |
51 source->AddLocalizedString("modulesNoneLoaded", | 51 source->AddLocalizedString("modulesNoneLoaded", |
52 IDS_CONFLICTS_NO_MODULES_LOADED); | 52 IDS_CONFLICTS_NO_MODULES_LOADED); |
53 source->AddLocalizedString("headerSoftware", IDS_CONFLICTS_HEADER_SOFTWARE); | 53 source->AddLocalizedString("headerSoftware", IDS_CONFLICTS_HEADER_SOFTWARE); |
54 source->AddLocalizedString("headerSignedBy", IDS_CONFLICTS_HEADER_SIGNED_BY); | 54 source->AddLocalizedString("headerSignedBy", IDS_CONFLICTS_HEADER_SIGNED_BY); |
55 source->AddLocalizedString("headerLocation", IDS_CONFLICTS_HEADER_LOCATION); | 55 source->AddLocalizedString("headerLocation", IDS_CONFLICTS_HEADER_LOCATION); |
56 source->AddLocalizedString("headerVersion", IDS_CONFLICTS_HEADER_VERSION); | 56 source->AddLocalizedString("headerVersion", IDS_CONFLICTS_HEADER_VERSION); |
57 source->AddLocalizedString("headerHelpTip", IDS_CONFLICTS_HEADER_HELP_TIP); | 57 source->AddLocalizedString("headerHelpTip", IDS_CONFLICTS_HEADER_HELP_TIP); |
58 source->set_json_path("strings.js"); | 58 source->set_json_path("strings.js"); |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 CreateConflictsUIHTMLSource()); | 161 CreateConflictsUIHTMLSource()); |
162 } | 162 } |
163 | 163 |
164 // static | 164 // static |
165 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { | 165 RefCountedMemory* ConflictsUI::GetFaviconResourceBytes() { |
166 return ResourceBundle::GetSharedInstance(). | 166 return ResourceBundle::GetSharedInstance(). |
167 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); | 167 LoadDataResourceBytes(IDR_CONFLICT_FAVICON); |
168 } | 168 } |
169 | 169 |
170 #endif | 170 #endif |
OLD | NEW |