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

Side by Side 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 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 #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ 6 #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_
7 7
8 #include "content/public/browser/javascript_dialog_manager.h" 8 #include "content/public/browser/javascript_dialog_manager.h"
9 9
10 #if defined(TOOLKIT_GTK) 10 #if defined(TOOLKIT_GTK)
(...skipping 11 matching lines...) Expand all
22 namespace content { 22 namespace content {
23 23
24 class ShellJavaScriptDialogManager; 24 class ShellJavaScriptDialogManager;
25 25
26 class ShellJavaScriptDialog { 26 class ShellJavaScriptDialog {
27 public: 27 public:
28 ShellJavaScriptDialog( 28 ShellJavaScriptDialog(
29 ShellJavaScriptDialogManager* manager, 29 ShellJavaScriptDialogManager* manager,
30 gfx::NativeWindow parent_window, 30 gfx::NativeWindow parent_window,
31 JavaScriptMessageType message_type, 31 JavaScriptMessageType message_type,
32 const string16& message_text, 32 const base::string16& message_text,
33 const string16& default_prompt_text, 33 const base::string16& default_prompt_text,
34 const JavaScriptDialogManager::DialogClosedCallback& callback); 34 const JavaScriptDialogManager::DialogClosedCallback& callback);
35 ~ShellJavaScriptDialog(); 35 ~ShellJavaScriptDialog();
36 36
37 // Called to cancel a dialog mid-flight. 37 // Called to cancel a dialog mid-flight.
38 void Cancel(); 38 void Cancel();
39 39
40 private: 40 private:
41 ShellJavaScriptDialogManager* manager_; 41 ShellJavaScriptDialogManager* manager_;
42 JavaScriptDialogManager::DialogClosedCallback callback_; 42 JavaScriptDialogManager::DialogClosedCallback callback_;
43 43
44 #if defined(OS_MACOSX) 44 #if defined(OS_MACOSX)
45 ShellJavaScriptDialogHelper* helper_; // owned 45 ShellJavaScriptDialogHelper* helper_; // owned
46 #elif defined(OS_WIN) 46 #elif defined(OS_WIN)
47 JavaScriptMessageType message_type_; 47 JavaScriptMessageType message_type_;
48 HWND dialog_win_; 48 HWND dialog_win_;
49 string16 message_text_; 49 base::string16 message_text_;
50 string16 default_prompt_text_; 50 base::string16 default_prompt_text_;
51 static INT_PTR CALLBACK DialogProc(HWND dialog, UINT message, WPARAM wparam, 51 static INT_PTR CALLBACK DialogProc(HWND dialog, UINT message, WPARAM wparam,
52 LPARAM lparam); 52 LPARAM lparam);
53 #elif defined(TOOLKIT_GTK) 53 #elif defined(TOOLKIT_GTK)
54 GtkWidget* gtk_dialog_; 54 GtkWidget* gtk_dialog_;
55 gfx::NativeWindow parent_window_; 55 gfx::NativeWindow parent_window_;
56 CHROMEGTK_CALLBACK_1(ShellJavaScriptDialog, void, OnResponse, int); 56 CHROMEGTK_CALLBACK_1(ShellJavaScriptDialog, void, OnResponse, int);
57 #endif 57 #endif
58 58
59 DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialog); 59 DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialog);
60 }; 60 };
61 61
62 } // namespace content 62 } // namespace content
63 63
64 #endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ 64 #endif // CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_
OLDNEW
« 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