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

Unified Diff: chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.cc

Issue 2822433003: Cleanup Tool WebUI: Add functionality to the Scan button (Closed)
Patch Set: Add WeakPtrFactory Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.cc
diff --git a/chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.cc b/chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.cc
index 1a84b1aebcf12e1a89f46067f1b4f0e15f51f126..e6bd13e7224e1fcde2cee0ce17a771b84cf028ea 100644
--- a/chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.cc
+++ b/chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.cc
@@ -5,9 +5,34 @@
#include "chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.h"
#include "base/bind.h"
+#include "base/timer/timer.h"
#include "base/values.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/component_updater/sw_reporter_installer_win.h"
-CleanupActionHandler::CleanupActionHandler() {}
+namespace {
+
+bool IsCleanupComponentRegistered() {
+ component_updater::ComponentUpdateService* cus =
+ g_browser_process->component_updater();
+ std::vector<std::string> component_ids = cus->GetComponentIDs();
+
+ return std::find(component_ids.begin(), component_ids.end(),
+ component_updater::kSwReporterComponentId) !=
+ component_ids.end();
+}
+
+// TODO(proberge): Localize strings once they are finalized.
+constexpr char kDetectionOkText[] = "No problems detected";
+constexpr char kDetectionUwSText[] = "2 potentially harmful programs detected";
+constexpr char kDetectionTimeText[] = "Last scanned today";
+constexpr char kCleanupUnsupportedText[] = "Chrome Cleanup is not supported.";
+constexpr char kUnsupportedHelpText[] = "Please try reinstalling Chrome";
+
+} // namespace
+
+CleanupActionHandler::CleanupActionHandler()
+ : callback_weak_ptr_factory_(this) {}
CleanupActionHandler::~CleanupActionHandler() {}
@@ -16,6 +41,13 @@ void CleanupActionHandler::RegisterMessages() {
"requestLastScanResult",
base::Bind(&CleanupActionHandler::HandleRequestLastScanResult,
base::Unretained(this)));
+ web_ui()->RegisterMessageCallback(
+ "startScan", base::Bind(&CleanupActionHandler::HandleStartScan,
+ base::Unretained(this)));
+}
+
+void CleanupActionHandler::OnJavascriptDisallowed() {
+ callback_weak_ptr_factory_.InvalidateWeakPtrs();
}
void CleanupActionHandler::HandleRequestLastScanResult(
@@ -27,12 +59,46 @@ void CleanupActionHandler::HandleRequestLastScanResult(
base::DictionaryValue last_scan_results;
// TODO(proberge): Return real information about the last run.
- // TODO(proberge): Localize strings once they are finalized.
last_scan_results.SetBoolean("hasScanResults", false);
last_scan_results.SetBoolean("isInfected", false);
- last_scan_results.SetString("detectionStatusText", "No problems detected");
- last_scan_results.SetString("detectionTimeText", "Last scanned today");
+ last_scan_results.SetString("detectionStatusText", kDetectionOkText);
+ last_scan_results.SetString("detectionTimeText", kDetectionTimeText);
AllowJavascript();
ResolveJavascriptCallback(base::Value(webui_callback_id), last_scan_results);
}
+
+void CleanupActionHandler::HandleStartScan(const base::ListValue* args) {
+ std::string webui_callback_id;
+ CHECK_EQ(1U, args->GetSize());
+ bool success = args->GetString(0, &webui_callback_id);
+ DCHECK(success);
+
+ if (!IsCleanupComponentRegistered()) {
+ base::DictionaryValue scan_results;
+ scan_results.SetBoolean("hasScanResults", false);
+ scan_results.SetBoolean("isInfected", false);
+ scan_results.SetString("detectionStatusText", kCleanupUnsupportedText);
+ scan_results.SetString("detectionTimeText", kUnsupportedHelpText);
+
+ AllowJavascript();
+ ResolveJavascriptCallback(base::Value(webui_callback_id), scan_results);
+ return;
+ }
+
+ component_updater::RegisterUserInitiatedSwReporterScan(
+ base::Bind(&CleanupActionHandler::ReportScanResults,
+ callback_weak_ptr_factory_.GetWeakPtr(), webui_callback_id));
+}
+
+void CleanupActionHandler::ReportScanResults(const std::string& callback_id) {
+ base::DictionaryValue scan_results;
+ // TODO(proberge): Return real information about the scan.
+ scan_results.SetBoolean("hasScanResults", true);
+ scan_results.SetBoolean("isInfected", true);
+ scan_results.SetString("detectionStatusText", kDetectionUwSText);
+ scan_results.SetString("detectionTimeText", kDetectionTimeText);
+
+ AllowJavascript();
+ ResolveJavascriptCallback(base::Value(callback_id), scan_results);
+}
« no previous file with comments | « chrome/browser/ui/webui/cleanup_tool/cleanup_action_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698