summaryrefslogtreecommitdiffstats
path: root/remoting/host/disconnect_window_win.cc
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 17:06:30 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 17:06:30 +0000
commit225e792ca6e9e7d43aa3a8fbe81ab6852a169ce5 (patch)
tree74d1ae4f7a43d2151b335c67c4c76cd02d2d3b7c /remoting/host/disconnect_window_win.cc
parent47850e5cdcf5b639d751d0b97ea1ae27dcd31de2 (diff)
downloadchromium_src-225e792ca6e9e7d43aa3a8fbe81ab6852a169ce5.zip
chromium_src-225e792ca6e9e7d43aa3a8fbe81ab6852a169ce5.tar.gz
chromium_src-225e792ca6e9e7d43aa3a8fbe81ab6852a169ce5.tar.bz2
Merged all Chromoting Host code into remoting_core.dll (Windows).
Consolidated all installable Chromoting Host core into remoting_core.dll and converted all executables into thin wrappers around entry points exposed by remoting_core.dll. This reduces size of the installer by approximately 600KB. This is the 3rd attempt to land this CL. The previous attempt was reverted at r179373 because ninja sometimes failed to create a manifest for targets that use manifestXXX linker flags. This CL fixes that by manually embedding the manifests into binaries. BUG=170200,173052 Review URL: https://codereview.chromium.org/12092117 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/disconnect_window_win.cc')
-rw-r--r--remoting/host/disconnect_window_win.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc
index ff41c67..8fc7ac4 100644
--- a/remoting/host/disconnect_window_win.cc
+++ b/remoting/host/disconnect_window_win.cc
@@ -14,8 +14,8 @@
#include "base/win/scoped_gdi_object.h"
#include "base/win/scoped_hdc.h"
#include "base/win/scoped_select_object.h"
-#include "remoting/host/host_ui_resource.h"
#include "remoting/host/ui_strings.h"
+#include "remoting/host/win/core_resource.h"
// TODO(garykac): Lots of duplicated code in this file and
// continue_window_win.cc. If we need to expand this then we should