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

Side by Side Diff: remoting/client/plugin/chromoting_instance.cc

Issue 18919005: Migrate from googleurl/ includes to url/ ones in the remaining top-level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make googleurl a temp include rule - to prevent others including it again Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « printing/print_settings_initializer.cc ('k') | remoting/host/dns_blackhole_checker.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 #include "remoting/client/plugin/chromoting_instance.h" 5 #include "remoting/client/plugin/chromoting_instance.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/json/json_reader.h" 12 #include "base/json/json_reader.h"
13 #include "base/json/json_writer.h" 13 #include "base/json/json_writer.h"
14 #include "base/lazy_instance.h" 14 #include "base/lazy_instance.h"
15 #include "base/logging.h" 15 #include "base/logging.h"
16 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/synchronization/lock.h" 18 #include "base/synchronization/lock.h"
19 #include "base/threading/thread.h" 19 #include "base/threading/thread.h"
20 #include "base/values.h" 20 #include "base/values.h"
21 #include "googleurl/src/gurl.h"
22 #include "jingle/glue/thread_wrapper.h" 21 #include "jingle/glue/thread_wrapper.h"
23 #include "media/base/media.h" 22 #include "media/base/media.h"
24 #include "net/socket/ssl_server_socket.h" 23 #include "net/socket/ssl_server_socket.h"
25 #include "ppapi/cpp/completion_callback.h" 24 #include "ppapi/cpp/completion_callback.h"
26 #include "ppapi/cpp/dev/url_util_dev.h" 25 #include "ppapi/cpp/dev/url_util_dev.h"
27 #include "ppapi/cpp/input_event.h" 26 #include "ppapi/cpp/input_event.h"
28 #include "ppapi/cpp/mouse_cursor.h" 27 #include "ppapi/cpp/mouse_cursor.h"
29 #include "ppapi/cpp/rect.h" 28 #include "ppapi/cpp/rect.h"
30 #include "remoting/base/constants.h" 29 #include "remoting/base/constants.h"
31 #include "remoting/base/util.h" 30 #include "remoting/base/util.h"
32 #include "remoting/client/chromoting_client.h" 31 #include "remoting/client/chromoting_client.h"
33 #include "remoting/client/client_config.h" 32 #include "remoting/client/client_config.h"
34 #include "remoting/client/frame_consumer_proxy.h" 33 #include "remoting/client/frame_consumer_proxy.h"
35 #include "remoting/client/plugin/pepper_audio_player.h" 34 #include "remoting/client/plugin/pepper_audio_player.h"
36 #include "remoting/client/plugin/pepper_input_handler.h" 35 #include "remoting/client/plugin/pepper_input_handler.h"
37 #include "remoting/client/plugin/pepper_port_allocator.h" 36 #include "remoting/client/plugin/pepper_port_allocator.h"
37 #include "remoting/client/plugin/pepper_signal_strategy.h"
38 #include "remoting/client/plugin/pepper_token_fetcher.h" 38 #include "remoting/client/plugin/pepper_token_fetcher.h"
39 #include "remoting/client/plugin/pepper_view.h" 39 #include "remoting/client/plugin/pepper_view.h"
40 #include "remoting/client/plugin/pepper_signal_strategy.h"
41 #include "remoting/client/rectangle_update_decoder.h" 40 #include "remoting/client/rectangle_update_decoder.h"
42 #include "remoting/protocol/connection_to_host.h" 41 #include "remoting/protocol/connection_to_host.h"
43 #include "remoting/protocol/host_stub.h" 42 #include "remoting/protocol/host_stub.h"
44 #include "remoting/protocol/libjingle_transport_factory.h" 43 #include "remoting/protocol/libjingle_transport_factory.h"
44 #include "url/gurl.h"
45 45
46 // Windows defines 'PostMessage', so we have to undef it. 46 // Windows defines 'PostMessage', so we have to undef it.
47 #if defined(PostMessage) 47 #if defined(PostMessage)
48 #undef PostMessage 48 #undef PostMessage
49 #endif 49 #endif
50 50
51 namespace remoting { 51 namespace remoting {
52 52
53 namespace { 53 namespace {
54 54
(...skipping 951 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 url_components.scheme.len); 1006 url_components.scheme.len);
1007 return url_scheme == kChromeExtensionUrlScheme; 1007 return url_scheme == kChromeExtensionUrlScheme;
1008 } 1008 }
1009 1009
1010 bool ChromotingInstance::IsConnected() { 1010 bool ChromotingInstance::IsConnected() {
1011 return host_connection_.get() && 1011 return host_connection_.get() &&
1012 (host_connection_->state() == protocol::ConnectionToHost::CONNECTED); 1012 (host_connection_->state() == protocol::ConnectionToHost::CONNECTED);
1013 } 1013 }
1014 1014
1015 } // namespace remoting 1015 } // namespace remoting
OLDNEW
« no previous file with comments | « printing/print_settings_initializer.cc ('k') | remoting/host/dns_blackhole_checker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698