| Index: content/shell/shell_javascript_dialog_win.cc
|
| ===================================================================
|
| --- content/shell/shell_javascript_dialog_win.cc (revision 182606)
|
| +++ content/shell/shell_javascript_dialog_win.cc (working copy)
|
| @@ -19,7 +19,7 @@
|
| 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));
|
| ShellJavaScriptDialog* owner =
|
| reinterpret_cast<ShellJavaScriptDialog*>(lparam);
|
| owner->dialog_win_ = dialog;
|
| @@ -31,7 +31,7 @@
|
| }
|
| case WM_DESTROY: {
|
| ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>(
|
| - GetWindowLongPtr(dialog, DWL_USER));
|
| + GetWindowLongPtr(dialog, DWLP_USER));
|
| if (owner->dialog_win_) {
|
| owner->dialog_win_ = 0;
|
| owner->callback_.Run(false, string16());
|
| @@ -41,7 +41,7 @@
|
| }
|
| case WM_COMMAND: {
|
| ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>(
|
| - GetWindowLongPtr(dialog, DWL_USER));
|
| + GetWindowLongPtr(dialog, DWLP_USER));
|
| string16 user_input;
|
| bool finish = false;
|
| bool result;
|
| @@ -50,7 +50,7 @@
|
| finish = true;
|
| result = true;
|
| if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
|
| - size_t length =
|
| + int length =
|
| GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1;
|
| GetDlgItemText(dialog, IDC_PROMPTEDIT,
|
| WriteInto(&user_input, length), length);
|
|
|