diff options
| author | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:36:29 +0000 |
|---|---|---|
| committer | simonmorris@chromium.org <simonmorris@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-02 21:36:29 +0000 |
| commit | 22170488cc1a93770dcdd1b290208feb3c18e47e (patch) | |
| tree | 2b2d23864f70ec3f244a83aba8eae53d75e1c362 /remoting | |
| parent | b592165f7de822d7bcaa3812ec11a4c4125d845a (diff) | |
| download | chromium_src-22170488cc1a93770dcdd1b290208feb3c18e47e.zip chromium_src-22170488cc1a93770dcdd1b290208feb3c18e47e.tar.gz chromium_src-22170488cc1a93770dcdd1b290208feb3c18e47e.tar.bz2 | |
[Chromoting] Move DaemonInstallerWin to remoting/host/setup.
This is a follow-up to https://codereview.chromium.org/10985086.
BUG=153453
Review URL: https://chromiumcodereview.appspot.com/11030019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/setup/DEPS (renamed from remoting/host/plugin/DEPS) | 0 | ||||
| -rw-r--r-- | remoting/host/setup/daemon_controller_win.cc | 2 | ||||
| -rw-r--r-- | remoting/host/setup/daemon_installer_win.cc (renamed from remoting/host/plugin/daemon_installer_win.cc) | 2 | ||||
| -rw-r--r-- | remoting/host/setup/daemon_installer_win.h (renamed from remoting/host/plugin/daemon_installer_win.h) | 0 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 6 |
5 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/plugin/DEPS b/remoting/host/setup/DEPS index 7251c42..7251c42 100644 --- a/remoting/host/plugin/DEPS +++ b/remoting/host/setup/DEPS diff --git a/remoting/host/setup/daemon_controller_win.cc b/remoting/host/setup/daemon_controller_win.cc index 64973ba..48f88f8 100644 --- a/remoting/host/setup/daemon_controller_win.cc +++ b/remoting/host/setup/daemon_controller_win.cc @@ -26,7 +26,7 @@ #include "base/win/windows_version.h" #include "remoting/base/scoped_sc_handle_win.h" #include "remoting/host/branding.h" -#include "remoting/host/plugin/daemon_installer_win.h" +#include "remoting/host/setup/daemon_installer_win.h" #include "remoting/host/usage_stats_consent.h" // MIDL-generated declarations and definitions. diff --git a/remoting/host/plugin/daemon_installer_win.cc b/remoting/host/setup/daemon_installer_win.cc index 1dd9d99..67c30a4 100644 --- a/remoting/host/plugin/daemon_installer_win.cc +++ b/remoting/host/setup/daemon_installer_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "remoting/host/plugin/daemon_installer_win.h" +#include "remoting/host/setup/daemon_installer_win.h" #include <windows.h> diff --git a/remoting/host/plugin/daemon_installer_win.h b/remoting/host/setup/daemon_installer_win.h index 3709982..3709982 100644 --- a/remoting/host/plugin/daemon_installer_win.h +++ b/remoting/host/setup/daemon_installer_win.h diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 4afd758..be5b2a5 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1026,10 +1026,13 @@ 'host/setup/daemon_controller_linux.cc', 'host/setup/daemon_controller_mac.cc', 'host/setup/daemon_controller_win.cc', + 'host/setup/daemon_installer_win.cc', + 'host/setup/daemon_installer_win.h', ], 'conditions': [ ['OS=="win"', { 'dependencies': [ + '../google_update/google_update.gyp:google_update', 'remoting_elevated_controller', ], }], @@ -1056,8 +1059,6 @@ 'host/branding.cc', 'host/branding.h', 'host/host_ui_resource.h', - 'host/plugin/daemon_installer_win.cc', - 'host/plugin/daemon_installer_win.h', 'host/plugin/host_log_handler.cc', 'host/plugin/host_log_handler.h', 'host/plugin/host_plugin.cc', @@ -1102,7 +1103,6 @@ }], # OS=="mac" [ 'OS=="win"', { 'dependencies': [ - '../google_update/google_update.gyp:google_update', 'remoting_elevated_controller', 'remoting_version_resources', ], |