diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 19:07:30 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 19:07:30 +0000 |
commit | 45936acf357193d351b0a39da85a7d9fa4f2d632 (patch) | |
tree | d953f8e19faa80fda8206f122dd4e998e65fd8c9 /remoting/host/disconnect_window_win.cc | |
parent | 7493c01516ae767782d9a6414114c8bf9e4035bb (diff) | |
download | chromium_src-45936acf357193d351b0a39da85a7d9fa4f2d632.zip chromium_src-45936acf357193d351b0a39da85a7d9fa4f2d632.tar.gz chromium_src-45936acf357193d351b0a39da85a7d9fa4f2d632.tar.bz2 |
Relanding r180433, now without build/some.gyp:
Merged all Chromoting Host code into remoting_core.dll (Windows).
Consolidated all installable Chromoting Host code 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 CL also ensures that proper manifests will be embedded into the binaries regardless whether msbuild or ninja is used.
TBR=sergeyu@chromium.org
BUG=170200, 173052
Review URL: https://codereview.chromium.org/12189013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180468 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/disconnect_window_win.cc')
-rw-r--r-- | remoting/host/disconnect_window_win.cc | 2 |
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 |