| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 base::IntToString16(list->GetSize())); | 131 base::IntToString16(list->GetSize())); |
| 132 } else { | 132 } else { |
| 133 table_title += l10n_util::GetStringFUTF16( | 133 table_title += l10n_util::GetStringFUTF16( |
| 134 IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_TWO, | 134 IDS_CONFLICTS_CHECK_PAGE_TABLE_TITLE_SUFFIX_TWO, |
| 135 base::IntToString16(list->GetSize()), | 135 base::IntToString16(list->GetSize()), |
| 136 base::IntToString16(confirmed_bad), | 136 base::IntToString16(confirmed_bad), |
| 137 base::IntToString16(suspected_bad)); | 137 base::IntToString16(suspected_bad)); |
| 138 } | 138 } |
| 139 results.SetString("modulesTableTitle", table_title); | 139 results.SetString("modulesTableTitle", table_title); |
| 140 | 140 |
| 141 web_ui()->CallJavascriptFunction("returnModuleList", results); | 141 web_ui()->CallJavascriptFunctionUnsafe("returnModuleList", results); |
| 142 } | 142 } |
| 143 | 143 |
| 144 void ConflictsDOMHandler::Observe(int type, | 144 void ConflictsDOMHandler::Observe(int type, |
| 145 const content::NotificationSource& source, | 145 const content::NotificationSource& source, |
| 146 const content::NotificationDetails& details) { | 146 const content::NotificationDetails& details) { |
| 147 switch (type) { | 147 switch (type) { |
| 148 case chrome::NOTIFICATION_MODULE_LIST_ENUMERATED: | 148 case chrome::NOTIFICATION_MODULE_LIST_ENUMERATED: |
| 149 SendModuleList(); | 149 SendModuleList(); |
| 150 registrar_.RemoveAll(); | 150 registrar_.RemoveAll(); |
| 151 break; | 151 break; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 174 | 174 |
| 175 // static | 175 // static |
| 176 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( | 176 base::RefCountedMemory* ConflictsUI::GetFaviconResourceBytes( |
| 177 ui::ScaleFactor scale_factor) { | 177 ui::ScaleFactor scale_factor) { |
| 178 return static_cast<base::RefCountedMemory*>( | 178 return static_cast<base::RefCountedMemory*>( |
| 179 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( | 179 ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale( |
| 180 IDR_CONFLICT_FAVICON, scale_factor)); | 180 IDR_CONFLICT_FAVICON, scale_factor)); |
| 181 } | 181 } |
| 182 | 182 |
| 183 #endif | 183 #endif |
| OLD | NEW |