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

Side by Side Diff: content/shell/browser/shell_javascript_dialog_win.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/browser/shell_javascript_dialog.h" 5 #include "content/shell/browser/shell_javascript_dialog.h"
6 6
7 #include "base/strings/string_util.h" 7 #include "base/strings/string_util.h"
8 #include "content/shell/app/resource.h" 8 #include "content/shell/app/resource.h"
9 #include "content/shell/browser/shell.h" 9 #include "content/shell/browser/shell.h"
10 #include "content/shell/browser/shell_javascript_dialog_manager.h" 10 #include "content/shell/browser/shell_javascript_dialog_manager.h"
(...skipping 16 matching lines...) Expand all
27 if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) 27 if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT)
28 SetDlgItemText(dialog, IDC_PROMPTEDIT, 28 SetDlgItemText(dialog, IDC_PROMPTEDIT,
29 owner->default_prompt_text_.c_str()); 29 owner->default_prompt_text_.c_str());
30 break; 30 break;
31 } 31 }
32 case WM_DESTROY: { 32 case WM_DESTROY: {
33 ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>( 33 ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>(
34 GetWindowLongPtr(dialog, DWLP_USER)); 34 GetWindowLongPtr(dialog, DWLP_USER));
35 if (owner->dialog_win_) { 35 if (owner->dialog_win_) {
36 owner->dialog_win_ = 0; 36 owner->dialog_win_ = 0;
37 owner->callback_.Run(false, string16()); 37 owner->callback_.Run(false, base::string16());
38 owner->manager_->DialogClosed(owner); 38 owner->manager_->DialogClosed(owner);
39 } 39 }
40 break; 40 break;
41 } 41 }
42 case WM_COMMAND: { 42 case WM_COMMAND: {
43 ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>( 43 ShellJavaScriptDialog* owner = reinterpret_cast<ShellJavaScriptDialog*>(
44 GetWindowLongPtr(dialog, DWLP_USER)); 44 GetWindowLongPtr(dialog, DWLP_USER));
45 string16 user_input; 45 base::string16 user_input;
46 bool finish = false; 46 bool finish = false;
47 bool result; 47 bool result;
48 switch (LOWORD(wparam)) { 48 switch (LOWORD(wparam)) {
49 case IDOK: 49 case IDOK:
50 finish = true; 50 finish = true;
51 result = true; 51 result = true;
52 if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) { 52 if (owner->message_type_ == JAVASCRIPT_MESSAGE_TYPE_PROMPT) {
53 int length = 53 int length =
54 GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1; 54 GetWindowTextLength(GetDlgItem(dialog, IDC_PROMPTEDIT)) + 1;
55 GetDlgItemText(dialog, IDC_PROMPTEDIT, 55 GetDlgItemText(dialog, IDC_PROMPTEDIT,
(...skipping 16 matching lines...) Expand all
72 default: 72 default:
73 return DefWindowProc(dialog, message, wparam, lparam); 73 return DefWindowProc(dialog, message, wparam, lparam);
74 } 74 }
75 return 0; 75 return 0;
76 } 76 }
77 77
78 ShellJavaScriptDialog::ShellJavaScriptDialog( 78 ShellJavaScriptDialog::ShellJavaScriptDialog(
79 ShellJavaScriptDialogManager* manager, 79 ShellJavaScriptDialogManager* manager,
80 gfx::NativeWindow parent_window, 80 gfx::NativeWindow parent_window,
81 JavaScriptMessageType message_type, 81 JavaScriptMessageType message_type,
82 const string16& message_text, 82 const base::string16& message_text,
83 const string16& default_prompt_text, 83 const base::string16& default_prompt_text,
84 const JavaScriptDialogManager::DialogClosedCallback& callback) 84 const JavaScriptDialogManager::DialogClosedCallback& callback)
85 : manager_(manager), 85 : manager_(manager),
86 callback_(callback), 86 callback_(callback),
87 message_text_(message_text), 87 message_text_(message_text),
88 default_prompt_text_(default_prompt_text), 88 default_prompt_text_(default_prompt_text),
89 message_type_(message_type) { 89 message_type_(message_type) {
90 int dialog_type; 90 int dialog_type;
91 if (message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT) 91 if (message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT)
92 dialog_type = IDD_ALERT; 92 dialog_type = IDD_ALERT;
93 else if (message_type == JAVASCRIPT_MESSAGE_TYPE_CONFIRM) 93 else if (message_type == JAVASCRIPT_MESSAGE_TYPE_CONFIRM)
(...skipping 10 matching lines...) Expand all
104 ShellJavaScriptDialog::~ShellJavaScriptDialog() { 104 ShellJavaScriptDialog::~ShellJavaScriptDialog() {
105 Cancel(); 105 Cancel();
106 } 106 }
107 107
108 void ShellJavaScriptDialog::Cancel() { 108 void ShellJavaScriptDialog::Cancel() {
109 if (dialog_win_) 109 if (dialog_win_)
110 DestroyWindow(dialog_win_); 110 DestroyWindow(dialog_win_);
111 } 111 }
112 112
113 } // namespace content 113 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_javascript_dialog_manager.cc ('k') | content/shell/browser/shell_login_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698