bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium revision 184577.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1111 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2013-02-27 17:56:03 +00:00
parent d9a4c5690b
commit c10f203620
24 changed files with 93 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libcef/browser/javascript_dialog_win.cc
View File

@ -8,7 +8,7 @@
#include "libcef/browser/browser_host_impl.h"
#include "libcef_dll/resource.h"
#include "base/file_path.h"
#include "base/files/file_path.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
@ -24,7 +24,7 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog,
LPARAM lparam) {
switch (message) {
case WM_INITDIALOG: {
SetWindowLongPtr(dialog, DWL_USER, static_cast<LONG_PTR>(lparam));
SetWindowLongPtr(dialog, DWLP_USER, static_cast<LONG_PTR>(lparam));
CefJavaScriptDialog* owner =
reinterpret_cast<CefJavaScriptDialog*>(lparam);
owner->dialog_win_ = dialog;
@ -36,7 +36,7 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog,
}
case WM_CLOSE: {
CefJavaScriptDialog* owner = reinterpret_cast<CefJavaScriptDialog*>(
GetWindowLongPtr(dialog, DWL_USER));
GetWindowLongPtr(dialog, DWLP_USER));
if (owner) {
owner->Cancel();
owner->callback_.Run(false, string16());
@ -50,7 +50,7 @@ INT_PTR CALLBACK CefJavaScriptDialog::DialogProc(HWND dialog,
}
case WM_COMMAND: {
CefJavaScriptDialog* owner = reinterpret_cast<CefJavaScriptDialog*>(
GetWindowLongPtr(dialog, DWL_USER));
GetWindowLongPtr(dialog, DWLP_USER));
string16 user_input;
bool finish = false;
bool result;
@ -158,7 +158,7 @@ void CefJavaScriptDialog::Cancel() {
}
if (dialog_win_ && IsWindow(dialog_win_)) {
SetWindowLongPtr(dialog_win_, DWL_USER, NULL);
SetWindowLongPtr(dialog_win_, DWLP_USER, NULL);
DestroyWindow(dialog_win_);
dialog_win_ = NULL;
}