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

Side by Side Diff: remoting/host/plugin/host_script_object.h

Issue 12316083: Move HostKeyPair into protocol::KeyPair. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 9 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
« no previous file with comments | « remoting/host/host_key_pair_unittest.cc ('k') | remoting/host/plugin/host_script_object.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_PLUGIN_HOST_SCRIPT_OBJECT_H_ 5 #ifndef REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
6 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_ 6 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/synchronization/cancellation_flag.h" 15 #include "base/synchronization/cancellation_flag.h"
16 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
17 #include "base/synchronization/waitable_event.h" 17 #include "base/synchronization/waitable_event.h"
18 #include "base/string16.h" 18 #include "base/string16.h"
19 #include "base/threading/platform_thread.h" 19 #include "base/threading/platform_thread.h"
20 #include "base/threading/thread.h" 20 #include "base/threading/thread.h"
21 #include "base/time.h" 21 #include "base/time.h"
22 #include "remoting/base/auto_thread_task_runner.h" 22 #include "remoting/base/auto_thread_task_runner.h"
23 #include "remoting/host/chromoting_host_context.h" 23 #include "remoting/host/chromoting_host_context.h"
24 #include "remoting/host/host_key_pair.h"
25 #include "remoting/host/log_to_server.h" 24 #include "remoting/host/log_to_server.h"
26 #include "remoting/host/plugin/host_plugin_utils.h" 25 #include "remoting/host/plugin/host_plugin_utils.h"
27 #include "remoting/host/setup/daemon_controller.h" 26 #include "remoting/host/setup/daemon_controller.h"
28 #include "remoting/host/ui_strings.h" 27 #include "remoting/host/ui_strings.h"
29 #include "remoting/jingle_glue/xmpp_signal_strategy.h" 28 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
30 #include "third_party/npapi/bindings/npapi.h" 29 #include "third_party/npapi/bindings/npapi.h"
31 #include "third_party/npapi/bindings/npfunctions.h" 30 #include "third_party/npapi/bindings/npfunctions.h"
32 #include "third_party/npapi/bindings/npruntime.h" 31 #include "third_party/npapi/bindings/npruntime.h"
33 32
34 namespace remoting { 33 namespace remoting {
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 // Used to cancel pending tasks for this object when it is destroyed. 305 // Used to cancel pending tasks for this object when it is destroyed.
307 base::WeakPtrFactory<HostNPScriptObject> weak_factory_; 306 base::WeakPtrFactory<HostNPScriptObject> weak_factory_;
308 base::WeakPtr<HostNPScriptObject> weak_ptr_; 307 base::WeakPtr<HostNPScriptObject> weak_ptr_;
309 308
310 DISALLOW_COPY_AND_ASSIGN(HostNPScriptObject); 309 DISALLOW_COPY_AND_ASSIGN(HostNPScriptObject);
311 }; 310 };
312 311
313 } // namespace remoting 312 } // namespace remoting
314 313
315 #endif // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_ 314 #endif // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
OLDNEW
« no previous file with comments | « remoting/host/host_key_pair_unittest.cc ('k') | remoting/host/plugin/host_script_object.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698