diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-31 20:30:28 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:31:41 -0700 |
| commit | 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 (patch) | |
| tree | 382278a54ce7a744d62fa510a9a80688cc12434b /chrome/common/remoting | |
| parent | c4becdd46e31d261b930e4b5a539cbc1d45c23a6 (diff) | |
| download | external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.zip external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.gz external_chromium-72a454cd3513ac24fbdd0e0cb9ad70b86a99b801.tar.bz2 | |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
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; |