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

Unified Diff: remoting/host/plugin/daemon_controller_win.cc

Issue 10695012: Addressing remaining Breakpad integration issues: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CR feedback and rebased. Created 8 years, 6 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 | « no previous file | remoting/host/usage_stats_consent_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/plugin/daemon_controller_win.cc
diff --git a/remoting/host/plugin/daemon_controller_win.cc b/remoting/host/plugin/daemon_controller_win.cc
index 040b1461d9bb14ea85f32f687f8e50ba06c8175f..2d8082c78c2bdf29482221a62428acbe0d31e023 100644
--- a/remoting/host/plugin/daemon_controller_win.cc
+++ b/remoting/host/plugin/daemon_controller_win.cc
@@ -643,7 +643,17 @@ void DaemonControllerWin::DoGetUsageStatsConsent(
// Activate the Daemon Controller and see if it supports |IDaemonControl2|.
HRESULT hr = ActivateController();
- if (FAILED(hr) || control2_.get() == NULL) {
+ if (FAILED(hr)) {
+ // The host is not installed yet. Assume that the user's consent is not
+ // recorded yet and set the default value to true. This value will not come
+ // into effect until the user installs the host and agrees to crash
+ // dump reporting.
+ done.Run(true, true, false);
+ return;
+ }
+
+ if (control2_.get() == NULL) {
+ // The host is installed and does not support crash dump reporting.
done.Run(false, false, false);
return;
}
@@ -655,7 +665,7 @@ void DaemonControllerWin::DoGetUsageStatsConsent(
if (FAILED(hr)) {
// If the user's consent is not recorded yet, set the default value to true.
// This value will not come into effect until the user agrees to crash
- // dump reporting while starting the host.
+ // dump reporting.
done.Run(true, true, false);
return;
}
« no previous file with comments | « no previous file | remoting/host/usage_stats_consent_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698