| Index: content/shell/shell_javascript_dialog.h
|
| diff --git a/content/shell/shell_javascript_dialog.h b/content/shell/shell_javascript_dialog.h
|
| index 68fe2ea73ac4ab348676b3043a7ccb7cf2d3129a..b819f3bd9e90b5a3c822bb0661f83fbac1747f6f 100644
|
| --- a/content/shell/shell_javascript_dialog.h
|
| +++ b/content/shell/shell_javascript_dialog.h
|
| @@ -5,7 +5,7 @@
|
| #ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_
|
| #define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_
|
|
|
| -#include "content/public/browser/javascript_dialogs.h"
|
| +#include "content/public/browser/javascript_dialog_manager.h"
|
|
|
| #if defined(TOOLKIT_GTK)
|
| #include "ui/base/gtk/gtk_signal.h"
|
| @@ -21,25 +21,25 @@ class ShellJavaScriptDialogHelper;
|
|
|
| namespace content {
|
|
|
| -class ShellJavaScriptDialogCreator;
|
| +class ShellJavaScriptDialogManager;
|
|
|
| class ShellJavaScriptDialog {
|
| public:
|
| ShellJavaScriptDialog(
|
| - ShellJavaScriptDialogCreator* creator,
|
| + ShellJavaScriptDialogManager* manager,
|
| gfx::NativeWindow parent_window,
|
| JavaScriptMessageType message_type,
|
| const string16& message_text,
|
| const string16& default_prompt_text,
|
| - const JavaScriptDialogCreator::DialogClosedCallback& callback);
|
| + const JavaScriptDialogManager::DialogClosedCallback& callback);
|
| ~ShellJavaScriptDialog();
|
|
|
| // Called to cancel a dialog mid-flight.
|
| void Cancel();
|
|
|
| private:
|
| - ShellJavaScriptDialogCreator* creator_;
|
| - JavaScriptDialogCreator::DialogClosedCallback callback_;
|
| + ShellJavaScriptDialogManager* manager_;
|
| + JavaScriptDialogManager::DialogClosedCallback callback_;
|
|
|
| #if defined(OS_MACOSX)
|
| ShellJavaScriptDialogHelper* helper_; // owned
|
|
|