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

Side by Side Diff: remoting/host/setup/me2me_native_messaging_host.h

Issue 1272833002: Pass error messages from native messaging to web-app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests. Created 5 years, 4 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 unified diff | Download patch
OLDNEW
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 #ifndef REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_ 5 #ifndef REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
6 #define REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_ 6 #define REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "base/threading/thread_checker.h" 11 #include "base/threading/thread_checker.h"
12 #include "base/timer/timer.h" 12 #include "base/timer/timer.h"
13 #include "extensions/browser/api/messaging/native_messaging_channel.h" 13 #include "extensions/browser/api/messaging/native_messaging_channel.h"
14 #include "remoting/host/native_messaging/log_message_handler.h"
14 #include "remoting/host/setup/daemon_controller.h" 15 #include "remoting/host/setup/daemon_controller.h"
15 #include "remoting/host/setup/oauth_client.h" 16 #include "remoting/host/setup/oauth_client.h"
16 17
17 namespace base { 18 namespace base {
18 class DictionaryValue; 19 class DictionaryValue;
19 class ListValue; 20 class ListValue;
20 } // namespace base 21 } // namespace base
21 22
22 namespace gaia { 23 namespace gaia {
23 class GaiaOAuthClient; 24 class GaiaOAuthClient;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 #if defined(OS_WIN) 167 #if defined(OS_WIN)
167 // Handle of the parent window. 168 // Handle of the parent window.
168 intptr_t parent_window_handle_; 169 intptr_t parent_window_handle_;
169 #endif // defined(OS_WIN) 170 #endif // defined(OS_WIN)
170 171
171 base::Closure quit_closure_; 172 base::Closure quit_closure_;
172 173
173 // Native messaging channel used to communicate with the native message 174 // Native messaging channel used to communicate with the native message
174 // client. 175 // client.
175 scoped_ptr<extensions::NativeMessagingChannel> channel_; 176 scoped_ptr<extensions::NativeMessagingChannel> channel_;
177
178 LogMessageHandler log_message_handler_;
179
176 scoped_refptr<DaemonController> daemon_controller_; 180 scoped_refptr<DaemonController> daemon_controller_;
177 181
178 // Used to load and update the paired clients for this host. 182 // Used to load and update the paired clients for this host.
179 scoped_refptr<protocol::PairingRegistry> pairing_registry_; 183 scoped_refptr<protocol::PairingRegistry> pairing_registry_;
180 184
181 // Used to exchange the service account authorization code for credentials. 185 // Used to exchange the service account authorization code for credentials.
182 scoped_ptr<OAuthClient> oauth_client_; 186 scoped_ptr<OAuthClient> oauth_client_;
183 187
184 base::ThreadChecker thread_checker_; 188 base::ThreadChecker thread_checker_;
185 189
186 base::WeakPtr<Me2MeNativeMessagingHost> weak_ptr_; 190 base::WeakPtr<Me2MeNativeMessagingHost> weak_ptr_;
187 base::WeakPtrFactory<Me2MeNativeMessagingHost> weak_factory_; 191 base::WeakPtrFactory<Me2MeNativeMessagingHost> weak_factory_;
188 192
189 DISALLOW_COPY_AND_ASSIGN(Me2MeNativeMessagingHost); 193 DISALLOW_COPY_AND_ASSIGN(Me2MeNativeMessagingHost);
190 }; 194 };
191 195
192 } // namespace remoting 196 } // namespace remoting
193 197
194 #endif // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_ 198 #endif // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698