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

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

Issue 10537182: The user's consent to crash dumps reporting can now be set via the UI (Windows only). The checkbox … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « remoting/host/plugin/daemon_controller.h ('k') | remoting/host/plugin/daemon_controller_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/plugin/daemon_controller_linux.cc
diff --git a/remoting/host/plugin/daemon_controller_linux.cc b/remoting/host/plugin/daemon_controller_linux.cc
index 7ed94400f3939aad320579756b881acc58ef6677..03436caf08690086ef05256efe87791abaf8cf1c 100644
--- a/remoting/host/plugin/daemon_controller_linux.cc
+++ b/remoting/host/plugin/daemon_controller_linux.cc
@@ -25,6 +25,7 @@
#include "net/base/net_util.h"
#include "remoting/host/host_config.h"
#include "remoting/host/json_host_config.h"
+#include "remoting/host/usage_stats_consent.h"
namespace remoting {
@@ -59,19 +60,22 @@ class DaemonControllerLinux : public remoting::DaemonController {
virtual void GetConfig(const GetConfigCallback& callback) OVERRIDE;
virtual void SetConfigAndStart(
scoped_ptr<base::DictionaryValue> config,
- const CompletionCallback& done_callback) OVERRIDE;
+ bool consent,
+ const CompletionCallback& done) OVERRIDE;
virtual void UpdateConfig(scoped_ptr<base::DictionaryValue> config,
const CompletionCallback& done_callback) OVERRIDE;
virtual void Stop(const CompletionCallback& done_callback) OVERRIDE;
virtual void SetWindow(void* window_handle) OVERRIDE;
virtual void GetVersion(const GetVersionCallback& done_callback) OVERRIDE;
+ virtual void GetUsageStatsConsent(
+ const GetUsageStatsConsentCallback& done) OVERRIDE;
private:
FilePath GetConfigPath();
void DoGetConfig(const GetConfigCallback& callback);
void DoSetConfigAndStart(scoped_ptr<base::DictionaryValue> config,
- const CompletionCallback& done_callback);
+ const CompletionCallback& done);
void DoUpdateConfig(scoped_ptr<base::DictionaryValue> config,
const CompletionCallback& done_callback);
void DoStop(const CompletionCallback& done_callback);
@@ -159,13 +163,21 @@ void DaemonControllerLinux::GetConfig(const GetConfigCallback& callback) {
&DaemonControllerLinux::DoGetConfig, base::Unretained(this), callback));
}
+void DaemonControllerLinux::GetUsageStatsConsent(
+ const GetUsageStatsConsentCallback& done) {
+ // Crash dump collection is not implemented on Linux yet.
+ // http://crbug.com/130678.
+ done.Run(false, false, false);
+}
+
void DaemonControllerLinux::SetConfigAndStart(
scoped_ptr<base::DictionaryValue> config,
- const CompletionCallback& done_callback) {
+ bool /* consent */,
+ const CompletionCallback& done) {
// base::Unretained() is safe because we control lifetime of the thread.
file_io_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
&DaemonControllerLinux::DoSetConfigAndStart, base::Unretained(this),
- base::Passed(&config), done_callback));
+ base::Passed(&config), done));
}
void DaemonControllerLinux::UpdateConfig(
@@ -221,7 +233,7 @@ void DaemonControllerLinux::DoGetConfig(const GetConfigCallback& callback) {
void DaemonControllerLinux::DoSetConfigAndStart(
scoped_ptr<base::DictionaryValue> config,
- const CompletionCallback& done_callback) {
+ const CompletionCallback& done) {
std::vector<std::string> args;
args.push_back("--explicit-config");
std::string config_json;
@@ -235,7 +247,7 @@ void DaemonControllerLinux::DoSetConfigAndStart(
} else {
result = RESULT_FAILED;
}
- done_callback.Run(result);
+ done.Run(result);
}
void DaemonControllerLinux::DoUpdateConfig(
« no previous file with comments | « remoting/host/plugin/daemon_controller.h ('k') | remoting/host/plugin/daemon_controller_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698