Move crashes_ui resources and utils to //components/crash

chrome/browser/ui/webui/crashes_ui.cc

Index: chrome/browser/ui/webui/crashes_ui.cc
diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc
index 14dd72938227de0b4a0e2f1a9bf05d8b329b50e0..53dceaeceb22b5fab48e8e19451e49a9eb377b42 100644
--- a/chrome/browser/ui/webui/crashes_ui.cc
+++ b/chrome/browser/ui/webui/crashes_ui.cc
@@ -4,11 +4,8 @@
 
 #include "chrome/browser/ui/webui/crashes_ui.h"
 
-#include <vector>
-
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/i18n/time_formatting.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
@@ -19,6 +16,7 @@
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/google_chrome_strings.h"
+#include "components/crash/core/browser/crashes_ui_util.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
@@ -28,8 +26,8 @@
 #include "grit/components_chromium_strings.h"
 #include "grit/components_google_chrome_strings.h"
 #include "grit/components_resources.h"
+#include "grit/components_scaled_resources.h"
 #include "grit/components_strings.h"
-#include "grit/theme_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
@@ -46,22 +44,27 @@ content::WebUIDataSource* CreateCrashesUIHTMLSource() {
   content::WebUIDataSource* source =
       content::WebUIDataSource::Create(chrome::kChromeUICrashesHost);
 
-  source->AddLocalizedString("shortProductName", IDS_SHORT_PRODUCT_NAME);
-  source->AddLocalizedString("crashesTitle", IDS_CRASH_TITLE);
-  source->AddLocalizedString("crashCountFormat",
+  source->AddLocalizedString(crash::kCrashesUIShortProductName,

[Robert Sesek, 2015/10/06 20:13:35]

Could you expose an array of struct{const char* name, int resource_id} to make
this a little less brittle?

[droger, 2015/10/07 09:39:10]

Good suggestion.
Done, except for IDS_SHORT_PRODUCT_NAME, which I would argue does not belong to
the component. Let me know if you feel strongly about this, because we do have
Google-specific strings in components, so it would be technically possible to
move it there.

+                             IDS_SHORT_PRODUCT_NAME);
+  source->AddLocalizedString(crash::kCrashesUICrashesTitle, IDS_CRASH_TITLE);
+  source->AddLocalizedString(crash::kCrashesUICrashCountFormat,
                              IDS_CRASH_CRASH_COUNT_BANNER_FORMAT);
-  source->AddLocalizedString("crashHeaderFormat",
+  source->AddLocalizedString(crash::kCrashesUICrashHeaderFormat,
                              IDS_CRASH_CRASH_HEADER_FORMAT);
-  source->AddLocalizedString("crashTimeFormat", IDS_CRASH_CRASH_TIME_FORMAT);
-  source->AddLocalizedString("bugLinkText", IDS_CRASH_BUG_LINK_LABEL);
-  source->AddLocalizedString("noCrashesMessage",
+  source->AddLocalizedString(crash::kCrashesUICrashTimeFormat,
+                             IDS_CRASH_CRASH_TIME_FORMAT);
+  source->AddLocalizedString(crash::kCrashesUIBugLinkText,
+                             IDS_CRASH_BUG_LINK_LABEL);
+  source->AddLocalizedString(crash::kCrashesUINoCrashesMessage,
                              IDS_CRASH_NO_CRASHES_MESSAGE);
-  source->AddLocalizedString("disabledHeader", IDS_CRASH_DISABLED_HEADER);
-  source->AddLocalizedString("disabledMessage", IDS_CRASH_DISABLED_MESSAGE);
-  source->AddLocalizedString("uploadCrashesLinkText",
+  source->AddLocalizedString(crash::kCrashesUIDisabledHeader,
+                             IDS_CRASH_DISABLED_HEADER);
+  source->AddLocalizedString(crash::kCrashesUIDisabledMessage,
+                             IDS_CRASH_DISABLED_MESSAGE);
+  source->AddLocalizedString(crash::kCrashesUIUploadCrashesLinkText,
                              IDS_CRASH_UPLOAD_MESSAGE);
   source->SetJsonPath("strings.js");
-  source->AddResourcePath("crashes.js", IDR_CRASH_CRASHES_JS);
+  source->AddResourcePath(crash::kCrashesUICrashesJS, IDR_CRASH_CRASHES_JS);
   source->SetDefaultResource(IDR_CRASH_CRASHES_HTML);
   return source;
 }
@@ -115,12 +118,14 @@ CrashesDOMHandler::~CrashesDOMHandler() {
 
 void CrashesDOMHandler::RegisterMessages() {
   upload_list_->LoadUploadListAsynchronously();
-  web_ui()->RegisterMessageCallback("requestCrashList",
+  web_ui()->RegisterMessageCallback(
+      crash::kCrashesUIRequestCrashList,
       base::Bind(&CrashesDOMHandler::HandleRequestCrashes,
                  base::Unretained(this)));
 
 #if defined(OS_CHROMEOS)
-  web_ui()->RegisterMessageCallback("requestCrashUpload",
+  web_ui()->RegisterMessageCallback(
+      crash::kCrashesUIRequestCrashUpload,
       base::Bind(&CrashesDOMHandler::HandleRequestUploads,
                  base::Unretained(this)));
 #endif
@@ -156,35 +161,22 @@ void CrashesDOMHandler::OnUploadListAvailable() {
 void CrashesDOMHandler::UpdateUI() {
   bool crash_reporting_enabled =
       ChromeMetricsServiceAccessor::IsMetricsAndCrashReportingEnabled();
-  base::ListValue crash_list;
-  bool system_crash_reporter = false;
 
+  bool system_crash_reporter = false;
 #if defined(OS_CHROMEOS)
   // Chrome OS has a system crash reporter.
   system_crash_reporter = true;
 #endif
 
-  if (crash_reporting_enabled) {
-    std::vector<CrashUploadList::UploadInfo> crashes;
-    upload_list_->GetUploads(50, &crashes);
-
-    for (std::vector<CrashUploadList::UploadInfo>::iterator i = crashes.begin();
-         i != crashes.end(); ++i) {
-      base::DictionaryValue* crash = new base::DictionaryValue();
-      crash->SetString("id", i->id);
-      crash->SetString("time", base::TimeFormatFriendlyDateAndTime(i->time));
-      crash->SetString("local_id", i->local_id);
-      crash_list.Append(crash);
-    }
-  }
+  base::ListValue crash_list;
+  if (crash_reporting_enabled)
+    crash::UploadListToValue(upload_list_.get(), &crash_list);
 
   base::FundamentalValue enabled(crash_reporting_enabled);
   base::FundamentalValue dynamic_backend(system_crash_reporter);
-
   base::StringValue version(version_info::GetVersionNumber());
-
-  web_ui()->CallJavascriptFunction("updateCrashList", enabled, dynamic_backend,
-                                   crash_list, version);
+  web_ui()->CallJavascriptFunction(crash::kCrashesUIUpdateCrashList, enabled,
+                                   dynamic_backend, crash_list, version);
 }
 
 }  // namespace
@@ -206,6 +198,6 @@ CrashesUI::CrashesUI(content::WebUI* web_ui) : WebUIController(web_ui) {
 // static
 base::RefCountedMemory* CrashesUI::GetFaviconResourceBytes(
       ui::ScaleFactor scale_factor) {
-  return ResourceBundle::GetSharedInstance().
-      LoadDataResourceBytesForScale(IDR_SAD_FAVICON, scale_factor);
+  return ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
+      IDR_CRASH_SAD_FAVICON, scale_factor);
 }