Revert 180433 because build\some.gyp was added to the CL by mistake.

remoting/host/continue_window_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/continue_window.h"
 
 #include <windows.h>
 
 #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 {
  public:
   explicit ContinueWindowWin(const UiStrings* ui_strings);
   virtual ~ContinueWindowWin();
 
   virtual void Show(const ContinueSessionCallback& callback) OVERRIDE;
   virtual void Hide() OVERRIDE;
 
@@ skipping 63 matching lines @@
           hwnd_ = NULL;
           return TRUE;
       }
   }
   return FALSE;
 }
 
 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.";
     return;
   }
 
   SetStrings();
   ShowWindow(hwnd_, SW_SHOW);
 }
 
@@ skipping 22 matching lines @@
   HWND hwndCancel = GetDlgItem(hwnd_, IDC_CONTINUE_CANCEL);
   CHECK(hwndCancel);
   SetWindowText(hwndCancel, ui_strings_->stop_sharing_button_text.c_str());
 }
 
 scoped_ptr<ContinueWindow> ContinueWindow::Create(const UiStrings* ui_strings) {
   return scoped_ptr<ContinueWindow>(new ContinueWindowWin(ui_strings));
 }
 
 }  // namespace remoting