diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-28 14:52:14 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-28 14:52:14 +0000 |
| commit | be2510c02f438cf2887985e7a9c4780ad8aedc01 (patch) | |
| tree | fd051f9ae7750fa2b4c6a485bd1f35be299404fb /content/shell/shell_javascript_dialog_win.cc | |
| parent | 25d97a94a2dd12cc3746affc51b93ef6681b2113 (diff) | |
| download | chromium_src-be2510c02f438cf2887985e7a9c4780ad8aedc01.zip chromium_src-be2510c02f438cf2887985e7a9c4780ad8aedc01.tar.gz chromium_src-be2510c02f438cf2887985e7a9c4780ad8aedc01.tar.bz2 | |
content: Move javascript_message_type.h into content/ from ui/.
BUG=98716
R=jam@chromium.org
TBR=pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10451047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_javascript_dialog_win.cc')
| -rw-r--r-- | content/shell/shell_javascript_dialog_win.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc index 7195ba5..065d0bb 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; |