diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 21:46:31 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-24 21:46:31 +0000 |
| commit | f07c7a111ecd0423bc4878e86364bb82cda07e67 (patch) | |
| tree | 24102abf3d64f07c405c6c82315d78cae0ff5f2a /remoting/host/win | |
| parent | e1324f25756a4fa4acc1ffd2bf99ee35796b83b5 (diff) | |
| download | chromium_src-f07c7a111ecd0423bc4878e86364bb82cda07e67.zip chromium_src-f07c7a111ecd0423bc4878e86364bb82cda07e67.tar.gz chromium_src-f07c7a111ecd0423bc4878e86364bb82cda07e67.tar.bz2 | |
Revert 158366 - Cleanups in Chromoting Host.
1. Removed constants.[h|cc]
2. Removed platform if-defs in remoting_me2me_host.cc where they are not necessary.
Review URL: https://codereview.chromium.org/10913260
TBR=sergeyu@chromium.org
Review URL: https://codereview.chromium.org/10988004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/win')
| -rw-r--r-- | remoting/host/win/omaha.cc | 14 | ||||
| -rw-r--r-- | remoting/host/win/omaha.h | 15 | ||||
| -rw-r--r-- | remoting/host/win/wts_session_process_launcher.cc | 2 |
3 files changed, 1 insertions, 30 deletions
diff --git a/remoting/host/win/omaha.cc b/remoting/host/win/omaha.cc deleted file mode 100644 index 2b1a31d..0000000 --- a/remoting/host/win/omaha.cc +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright (c) 2012 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 "remoting/host/win/omaha.h" - -namespace remoting { - -// The Omaha Appid of the host. It should be kept in sync with $(var.OmahaAppid) -// defined in remoting/host/win/chromoting.wxs and the Omaha server -// configuration. -const wchar_t kHostOmahaAppid[] = L"{b210701e-ffc4-49e3-932b-370728c72662}"; - -} // namespace remoting diff --git a/remoting/host/win/omaha.h b/remoting/host/win/omaha.h deleted file mode 100644 index d2d19e5..0000000 --- a/remoting/host/win/omaha.h +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2012 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. - -#ifndef REMOTING_HOST_WIN_OMAHA_H_ -#define REMOTING_HOST_WIN_OMAHA_H_ - -namespace remoting { - -// The Omaha Appid of the host. -extern const wchar_t kHostOmahaAppid[]; - -} // namespace remoting - -#endif // REMOTING_HOST_WIN_OMAHA_H_ diff --git a/remoting/host/win/wts_session_process_launcher.cc b/remoting/host/win/wts_session_process_launcher.cc index 29d30be..9696098 100644 --- a/remoting/host/win/wts_session_process_launcher.cc +++ b/remoting/host/win/wts_session_process_launcher.cc @@ -28,8 +28,8 @@ #include "ipc/ipc_channel_proxy.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" +#include "remoting/host/constants.h" #include "remoting/host/chromoting_messages.h" -#include "remoting/host/host_exit_codes.h" #include "remoting/host/win/launch_process_with_token.h" #include "remoting/host/win/wts_console_monitor.h" |