diff options
| author | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 08:44:56 +0000 |
|---|---|---|
| committer | vitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 08:44:56 +0000 |
| commit | d9f1bc774a6433c96fd443089f526c715ef37c25 (patch) | |
| tree | ef3c16b29fbd55cb7128760ecf1c493e7ed4abed /remoting/host/disconnect_window_win.cc | |
| parent | 6c9bb873daad1bcfe50bfa9b770d606d9cabbdbb (diff) | |
| download | chromium_src-d9f1bc774a6433c96fd443089f526c715ef37c25.zip chromium_src-d9f1bc774a6433c96fd443089f526c715ef37c25.tar.gz chromium_src-d9f1bc774a6433c96fd443089f526c715ef37c25.tar.bz2 | |
Revert 179294, MAC linking is fixed by 179304
> Revert "Merged all Chromoting Host code into remoting_core.dll (Windows)."
>
> This reverts commit r179226.
>
> Broke mac dbg build.
>
> > 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.
> >
> > BUG=170200
> >
> > Review URL: https://chromiumcodereview.appspot.com/11970044
>
> TBR=alexeypa@chromium.org
>
> Review URL: https://codereview.chromium.org/12094024
TBR=mattm@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179306 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 |