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

Unified Diff: remoting/host/setup/native_messaging_host.h

Issue 23606019: Refactor the daemon controller so that the callbacks are called on the caller thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the license Created 7 years, 3 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/setup/host_starter.cc ('k') | remoting/host/setup/native_messaging_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/setup/native_messaging_host.h
diff --git a/remoting/host/setup/native_messaging_host.h b/remoting/host/setup/native_messaging_host.h
index 986bbf91b67ab73436c3394a1d598cf1fdae0f96..eb7250a669664b14a9d648ca52cba09a295930ff 100644
--- a/remoting/host/setup/native_messaging_host.h
+++ b/remoting/host/setup/native_messaging_host.h
@@ -36,7 +36,7 @@ class PairingRegistry;
class NativeMessagingHost {
public:
NativeMessagingHost(
- scoped_ptr<DaemonController> daemon_controller,
+ scoped_refptr<DaemonController> daemon_controller,
scoped_refptr<protocol::PairingRegistry> pairing_registry,
scoped_ptr<OAuthClient> oauth_client,
base::PlatformFile input,
@@ -104,10 +104,9 @@ class NativeMessagingHost {
scoped_ptr<base::DictionaryValue> config);
void SendPairedClientsResponse(scoped_ptr<base::DictionaryValue> response,
scoped_ptr<base::ListValue> pairings);
- void SendUsageStatsConsentResponse(scoped_ptr<base::DictionaryValue> response,
- bool supported,
- bool allowed,
- bool set_by_policy);
+ void SendUsageStatsConsentResponse(
+ scoped_ptr<base::DictionaryValue> response,
+ const DaemonController::UsageStatsConsent& consent);
void SendAsyncResult(scoped_ptr<base::DictionaryValue> response,
DaemonController::AsyncResult result);
void SendBooleanResult(scoped_ptr<base::DictionaryValue> response,
@@ -130,7 +129,7 @@ class NativeMessagingHost {
// The DaemonController may post tasks to this object during destruction (but
// not afterwards), so it needs to be destroyed before other members of this
// class (except for |weak_factory_|).
- scoped_ptr<remoting::DaemonController> daemon_controller_;
+ scoped_refptr<remoting::DaemonController> daemon_controller_;
// Used to load and update the paired clients for this host.
scoped_refptr<protocol::PairingRegistry> pairing_registry_;
« no previous file with comments | « remoting/host/setup/host_starter.cc ('k') | remoting/host/setup/native_messaging_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698