diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 05:17:08 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-29 05:17:08 +0000 |
| commit | 0f4411d4694436df07b26804bf774fa53cef9b8b (patch) | |
| tree | d8020ae8130b8ecd82b5dfbf33e73b36b15bec03 /remoting/host/continue_window_win.cc | |
| parent | eb2ef21c332ae0de01e236699e1a46003941897c (diff) | |
| download | chromium_src-0f4411d4694436df07b26804bf774fa53cef9b8b.zip chromium_src-0f4411d4694436df07b26804bf774fa53cef9b8b.tar.gz chromium_src-0f4411d4694436df07b26804bf774fa53cef9b8b.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179294 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/continue_window_win.cc')
| -rw-r--r-- | remoting/host/continue_window_win.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/remoting/host/continue_window_win.cc b/remoting/host/continue_window_win.cc index fc03615..76cc42b 100644 --- a/remoting/host/continue_window_win.cc +++ b/remoting/host/continue_window_win.cc @@ -8,16 +8,21 @@ #include "base/compiler_specific.h" #include "base/logging.h" -#include "base/process_util.h" #include "base/utf_string_conversions.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 // disconnect_window_win.cc. These global floating windows are temporary so // they should be deleted soon. If we need to expand this then we should // create a class with the shared code. +// HMODULE from DllMain/WinMain. This is needed to find our dialog resource. +// This is defined in: +// Plugin: host_plugin.cc +// SimpleHost: simple_host_process.cc +extern HMODULE g_hModule; + namespace remoting { class ContinueWindowWin : public ContinueWindow { @@ -101,10 +106,8 @@ BOOL ContinueWindowWin::OnDialogMessage(HWND hwnd, UINT msg, void ContinueWindowWin::Show(const ContinueSessionCallback& callback) { callback_ = callback; - HMODULE instance = base::GetModuleFromAddress(&DialogProc); - CHECK(!hwnd_); - hwnd_ = CreateDialogParam(instance, MAKEINTRESOURCE(IDD_CONTINUE), NULL, + hwnd_ = CreateDialogParam(g_hModule, MAKEINTRESOURCE(IDD_CONTINUE), NULL, (DLGPROC)DialogProc, (LPARAM)this); if (!hwnd_) { LOG(ERROR) << "Unable to create Disconnect dialog for remoting."; |