Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Unified Diff: content/shell/shell_javascript_dialog_win.cc

Issue 12254051: Make content_shell build on Win64 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « content/content_shell.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698