Index: content/shell/shell_javascript_dialog_win.cc |
diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc |
index 7195ba5c2e68a8d345beef5fcb8262e51c2cdb51..065d0bbf4a469298a8cd8448d6f06c399e750b79 100644 |
--- a/content/shell/shell_javascript_dialog_win.cc |
+++ b/content/shell/shell_javascript_dialog_win.cc |
@@ -13,7 +13,8 @@ namespace content { |
class ShellJavaScriptDialog; |
-INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, UINT message, |
+INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, |
+ UINT message, |
WPARAM wparam, |
LPARAM lparam) { |
switch (message) { |
@@ -23,7 +24,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, UINT message, |
reinterpret_cast<ShellJavaScriptDialog*>(lparam); |
owner->dialog_win_ = dialog; |
SetDlgItemText(dialog, IDC_DIALOGTEXT, owner->message_text_.c_str()); |
- if (owner->message_type_ == ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT) |
+ if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) |
SetDlgItemText(dialog, IDC_PROMPTEDIT, |
owner->default_prompt_text_.c_str()); |
break; |
@@ -48,7 +49,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, UINT message, |
case IDOK: |
finish = true; |
result = true; |
- if (owner->message_type_ == ui::JAVASCRIPT_MESSAGE_TYPE_PROMPT) { |
+ if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) { |
size_t length = |
GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1; |
GetDlgItemText(dialog, IDC_PROMPTEDIT, |
@@ -76,7 +77,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog, UINT message, |
ShellJavaScriptDialog::ShellJavaScriptDialog( |
ShellJavaScriptDialogCreator* creator, |
- ui::JavascriptMessageType javascript_message_type, |
+ JavaScriptMessageType message_type, |
const string16& message_text, |
const string16& default_prompt_text, |
const JavaScriptDialogCreator::DialogClosedCallback& callback) |
@@ -84,11 +85,11 @@ ShellJavaScriptDialog::ShellJavaScriptDialog( |
callback_(callback), |
message_text_(message_text), |
default_prompt_text_(default_prompt_text), |
- message_type_(javascript_message_type) { |
+ message_type_(message_type) { |
int dialog_type; |
- if (javascript_message_type == ui::JAVASCRIPT_MESSAGE_TYPE_ALERT) |
+ if (message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT) |
dialog_type = IDD_ALERT; |
- else if (javascript_message_type == ui::JAVASCRIPT_MESSAGE_TYPE_CONFIRM) |
+ else if (message_type == JAVASCRIPT_MESSAGE_TYPE_CONFIRM) |
dialog_type = IDD_CONFIRM; |
else // JAVASCRIPT_MESSAGE_TYPE_PROMPT |
dialog_type = IDD_PROMPT; |