diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:57:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-14 20:57:52 -0700 |
| commit | fd1998388c6e6e45dfaf3d6bd71d9fba541b0c43 (patch) | |
| tree | 8dd8b33297dec4cb73154315234bdc22187a5d8b /chrome/common/remoting | |
| parent | d86b20e6743fe4a26ba4a12d4f32439463f60dac (diff) | |
| parent | 4132ad582ab8dd199263321e08b3cff02b854fa0 (diff) | |
| download | external_chromium-fd1998388c6e6e45dfaf3d6bd71d9fba541b0c43.zip external_chromium-fd1998388c6e6e45dfaf3d6bd71d9fba541b0c43.tar.gz external_chromium-fd1998388c6e6e45dfaf3d6bd71d9fba541b0c43.tar.bz2 | |
Merge changes I36d92007,I667a6803,Ia6df2c26,I68425903,I3ed7374e,Icc88f69e,Ifa32ffeb,I2819b8a4,I0267206e,I4fbbef3c,Ic2f68044,Idcad89f5,Ia2d53e01,Ifd158f1a,I13ae0d97,Ie63b95f5,Icbc82026,I9547a3c8,I55c66cce,I39c1e29e,Ibfb86a74,I8a0c21f6,I3c06547e,I9b689dfe,I8b4aaf61,I5ee38228,Iee92f225
* changes:
Remove guards for upstreamed change
Merge Chromium at r11.0.672.0: Compile fixes in pref_service.cc
Merge Chromium at r11.0.672.0: Compile fix in autofill_manager.*
Merge Chromium at r11.0.672.0: Compile fix in profile_android.h
Merge Chromium at r11.0.672.0: Compile fix in android_url_request_context_getter.*
Merge Chromium at r11.0.672.0: Compile fix in dnsrr_resolver.cc
Merge Chromium at r11.0.672.0: Compile fix in android_network_library.cc
Merge Chromium at r11.0.672.0: Compile fix in url_fetcher_proxy.h
Merge Chromium at r11.0.672.0: Files moved upstream
Merge Chromium at r11.0.672.0: Fix Makefiles.
Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.cc
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.cc
Merge Chromium at r11.0.672.0: Fix conflicts in personal_data_manager.cc
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_manager.*
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_downlad.cc
Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.h
Merge Chromium at r11.0.672.0: Fix conflicts in autofill_dialog.h
Merge Chromium at r11.0.672.0: Fix conflicts in url_request_http_job.cc
Merge Chromium at r11.0.672.0: Fix conflicts in tcp_client_socket_libevent.cc
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket_pool.cc
Merge Chromium at r11.0.672.0: Fix conflicts in http_proxy_client_socket.h
Merge Chromium at r11.0.672.0: Fix conflicts in net_util.cc
Merge Chromium at r11.0.672.0: Fix conflicts in shared_memory_posix.cc
Merge Chromium at r11.0.672.0: Fix conflicts in logging.cc
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Reduce pref usage by autofill
File not used, matching upstream to avoid conflicts.
Diffstat (limited to 'chrome/common/remoting')
| -rw-r--r-- | chrome/common/remoting/chromoting_host_info.cc | 15 | ||||
| -rw-r--r-- | chrome/common/remoting/chromoting_host_info.h | 3 |
2 files changed, 18 insertions, 0 deletions
diff --git a/chrome/common/remoting/chromoting_host_info.cc b/chrome/common/remoting/chromoting_host_info.cc new file mode 100644 index 0000000..acb0ce5 --- /dev/null +++ b/chrome/common/remoting/chromoting_host_info.cc @@ -0,0 +1,15 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/common/remoting/chromoting_host_info.h" + +namespace remoting { + +ChromotingHostInfo::ChromotingHostInfo() + : enabled(false) { +} + +ChromotingHostInfo::~ChromotingHostInfo() {} + +} // namespace remoting diff --git a/chrome/common/remoting/chromoting_host_info.h b/chrome/common/remoting/chromoting_host_info.h index e803eef..f1816da 100644 --- a/chrome/common/remoting/chromoting_host_info.h +++ b/chrome/common/remoting/chromoting_host_info.h @@ -11,6 +11,9 @@ namespace remoting { // This struct is used for ServiceHostMsg_ChromotingHost_Info IPC message. struct ChromotingHostInfo { + ChromotingHostInfo(); + ~ChromotingHostInfo(); + std::string host_id; std::string hostname; std::string public_key; |