OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/host/setup/me2me_native_messaging_host.h" | 5 #include "remoting/host/setup/me2me_native_messaging_host.h" |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 intptr_t parent_window_handle, | 76 intptr_t parent_window_handle, |
77 scoped_ptr<extensions::NativeMessagingChannel> channel, | 77 scoped_ptr<extensions::NativeMessagingChannel> channel, |
78 scoped_refptr<DaemonController> daemon_controller, | 78 scoped_refptr<DaemonController> daemon_controller, |
79 scoped_refptr<protocol::PairingRegistry> pairing_registry, | 79 scoped_refptr<protocol::PairingRegistry> pairing_registry, |
80 scoped_ptr<OAuthClient> oauth_client) | 80 scoped_ptr<OAuthClient> oauth_client) |
81 : needs_elevation_(needs_elevation), | 81 : needs_elevation_(needs_elevation), |
82 #if defined(OS_WIN) | 82 #if defined(OS_WIN) |
83 parent_window_handle_(parent_window_handle), | 83 parent_window_handle_(parent_window_handle), |
84 #endif | 84 #endif |
85 channel_(channel.Pass()), | 85 channel_(channel.Pass()), |
| 86 log_message_handler_( |
| 87 base::Bind(&extensions::NativeMessagingChannel::SendMessage, |
| 88 base::Unretained(channel_.get()))), |
86 daemon_controller_(daemon_controller), | 89 daemon_controller_(daemon_controller), |
87 pairing_registry_(pairing_registry), | 90 pairing_registry_(pairing_registry), |
88 oauth_client_(oauth_client.Pass()), | 91 oauth_client_(oauth_client.Pass()), |
89 weak_factory_(this) { | 92 weak_factory_(this) { |
90 weak_ptr_ = weak_factory_.GetWeakPtr(); | 93 weak_ptr_ = weak_factory_.GetWeakPtr(); |
91 } | 94 } |
92 | 95 |
93 Me2MeNativeMessagingHost::~Me2MeNativeMessagingHost() { | 96 Me2MeNativeMessagingHost::~Me2MeNativeMessagingHost() { |
94 DCHECK(thread_checker_.CalledOnValidThread()); | 97 DCHECK(thread_checker_.CalledOnValidThread()); |
95 } | 98 } |
(...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
735 | 738 |
736 bool Me2MeNativeMessagingHost::DelegateToElevatedHost( | 739 bool Me2MeNativeMessagingHost::DelegateToElevatedHost( |
737 scoped_ptr<base::DictionaryValue> message) { | 740 scoped_ptr<base::DictionaryValue> message) { |
738 NOTREACHED(); | 741 NOTREACHED(); |
739 return false; | 742 return false; |
740 } | 743 } |
741 | 744 |
742 #endif // !defined(OS_WIN) | 745 #endif // !defined(OS_WIN) |
743 | 746 |
744 } // namespace remoting | 747 } // namespace remoting |
OLD | NEW |