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

Unified Diff: content/shell/browser/shell_javascript_dialog.h

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/shell/browser/shell_gtk.cc ('k') | content/shell/browser/shell_javascript_dialog_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_javascript_dialog.h
diff --git a/content/shell/browser/shell_javascript_dialog.h b/content/shell/browser/shell_javascript_dialog.h
index 4001334c788fdde535e342b7dc7fe519df247db8..233296bdad2c170eb719180fd7b6ccb35700cd01 100644
--- a/content/shell/browser/shell_javascript_dialog.h
+++ b/content/shell/browser/shell_javascript_dialog.h
@@ -29,8 +29,8 @@ class ShellJavaScriptDialog {
ShellJavaScriptDialogManager* manager,
gfx::NativeWindow parent_window,
JavaScriptMessageType message_type,
- const string16& message_text,
- const string16& default_prompt_text,
+ const base::string16& message_text,
+ const base::string16& default_prompt_text,
const JavaScriptDialogManager::DialogClosedCallback& callback);
~ShellJavaScriptDialog();
@@ -46,8 +46,8 @@ class ShellJavaScriptDialog {
#elif defined(OS_WIN)
JavaScriptMessageType message_type_;
HWND dialog_win_;
- string16 message_text_;
- string16 default_prompt_text_;
+ base::string16 message_text_;
+ base::string16 default_prompt_text_;
static INT_PTR CALLBACK DialogProc(HWND dialog, UINT message, WPARAM wparam,
LPARAM lparam);
#elif defined(TOOLKIT_GTK)
« no previous file with comments | « content/shell/browser/shell_gtk.cc ('k') | content/shell/browser/shell_javascript_dialog_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698