From 9d430a85d4c77804673a892b4b8c88d7f918c5c6 Mon Sep 17 00:00:00 2001 From: "lambroslambrou@chromium.org" Date: Wed, 12 Dec 2012 23:13:47 +0000 Subject: Ensure Chromoting crash-reporting is opt-in Update all default or error code-paths to set the flag to false. BUG=165373 Review URL: https://chromiumcodereview.appspot.com/11547008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172689 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/host/setup/daemon_controller_win.cc | 15 ++++++--------- remoting/webapp/host_setup_dialog.js | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'remoting') diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/setup/daemon_controller_win.cc index fd96af2..5d1ac62 100644 --- a/remoting/host/setup/daemon_controller_win.cc +++ b/remoting/host/setup/daemon_controller_win.cc @@ -636,11 +636,9 @@ void DaemonControllerWin::DoGetUsageStatsConsent( // Activate the Daemon Controller and see if it supports |IDaemonControl2|. HRESULT hr = ActivateController(); 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); + // The host is not installed yet. Assume that the user didn't consent to + // collecting crash dumps. + done.Run(true, false, false); return; } @@ -655,10 +653,9 @@ void DaemonControllerWin::DoGetUsageStatsConsent( BOOL set_by_policy; hr = control2_->GetUsageStatsConsent(&allowed, &set_by_policy); 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. - done.Run(true, true, false); + // If the user's consent is not recorded yet, assume that the user didn't + // consent to collecting crash dumps. + done.Run(true, false, false); return; } diff --git a/remoting/webapp/host_setup_dialog.js b/remoting/webapp/host_setup_dialog.js index a9b6e5c..c410ece 100644 --- a/remoting/webapp/host_setup_dialog.js +++ b/remoting/webapp/host_setup_dialog.js @@ -183,7 +183,7 @@ remoting.HostSetupDialog.prototype.showForStartWithToken_ = function(token) { that.usageStatsCheckbox_.disabled = set_by_policy; }; this.usageStats_.hidden = false; - this.usageStatsCheckbox_.checked = true; + this.usageStatsCheckbox_.checked = false; this.hostController_.getConsent(onGetConsent); var flow = [ -- cgit v1.1