| OLD | NEW |
| 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/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 using base::UserMetricsAction; | 38 using base::UserMetricsAction; |
| 39 using content::WebContents; | 39 using content::WebContents; |
| 40 using content::WebUIMessageHandler; | 40 using content::WebUIMessageHandler; |
| 41 | 41 |
| 42 namespace { | 42 namespace { |
| 43 | 43 |
| 44 content::WebUIDataSource* CreateConflictsUIHTMLSource() { | 44 content::WebUIDataSource* CreateConflictsUIHTMLSource() { |
| 45 content::WebUIDataSource* source = | 45 content::WebUIDataSource* source = |
| 46 content::WebUIDataSource::Create(chrome::kChromeUIConflictsHost); | 46 content::WebUIDataSource::Create(chrome::kChromeUIConflictsHost); |
| 47 | 47 |
| 48 source->SetUseJsonJSFormatV2(); | |
| 49 source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE); | 48 source->AddLocalizedString("loadingMessage", IDS_CONFLICTS_LOADING_MESSAGE); |
| 50 source->AddLocalizedString("modulesLongTitle", | 49 source->AddLocalizedString("modulesLongTitle", |
| 51 IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG); | 50 IDS_CONFLICTS_CHECK_PAGE_TITLE_LONG); |
| 52 source->AddLocalizedString("modulesBlurb", IDS_CONFLICTS_EXPLANATION_TEXT); | 51 source->AddLocalizedString("modulesBlurb", IDS_CONFLICTS_EXPLANATION_TEXT); |
| 53 source->AddLocalizedString("moduleSuspectedBad", | 52 source->AddLocalizedString("moduleSuspectedBad", |
| 54 IDS_CONFLICTS_CHECK_WARNING_SUSPECTED); | 53 IDS_CONFLICTS_CHECK_WARNING_SUSPECTED); |
| 55 source->AddLocalizedString("moduleConfirmedBad", | 54 source->AddLocalizedString("moduleConfirmedBad", |
| 56 IDS_CONFLICTS_CHECK_WARNING_CONFIRMED); | 55 IDS_CONFLICTS_CHECK_WARNING_CONFIRMED); |
| 57 source->AddLocalizedString("helpCenterLink", IDS_LEARN_MORE); | 56 source->AddLocalizedString("helpCenterLink", IDS_LEARN_MORE); |
| 58 source->AddLocalizedString("investigatingText", | 57 source->AddLocalizedString("investigatingText", |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 | 172 |
| 174 // static | 173 // static |
| 175 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( | 174 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( |
| 176 ui::ScaleFactor scale_factor) { | 175 ui::ScaleFactor scale_factor) { |
| 177 return static_cast<base::RefCountedMemory*>( | 176 return static_cast<base::RefCountedMemory*>( |
| 178 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 177 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 179 IDR_CONFLICT_FAVICON, scale_factor)); | 178 IDR_CONFLICT_FAVICON, scale_factor)); |
| 180 } | 179 } |
| 181 | 180 |
| 182 #endif | 181 #endif |
| OLD | NEW |