summaryrefslogtreecommitdiffstats
path: root/content/shell
diff options
context:
space:
mode:
Diffstat (limited to 'content/shell')
-rw-r--r--content/shell/shell.cc10
-rw-r--r--content/shell/shell.h6
-rw-r--r--content/shell/shell_javascript_dialog.h12
-rw-r--r--content/shell/shell_javascript_dialog_gtk.cc10
-rw-r--r--content/shell/shell_javascript_dialog_mac.mm26
-rw-r--r--content/shell/shell_javascript_dialog_manager.cc (renamed from content/shell/shell_javascript_dialog_creator.cc)14
-rw-r--r--content/shell/shell_javascript_dialog_manager.h (renamed from content/shell/shell_javascript_dialog_creator.h)20
-rw-r--r--content/shell/shell_javascript_dialog_win.cc12
8 files changed, 55 insertions, 55 deletions
diff --git a/content/shell/shell.cc b/content/shell/shell.cc
index 91bd36d..0e94316 100644
--- a/content/shell/shell.cc
+++ b/content/shell/shell.cc
@@ -25,7 +25,7 @@
#include "content/shell/shell_browser_main_parts.h"
#include "content/shell/shell_content_browser_client.h"
#include "content/shell/shell_devtools_frontend.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
#include "content/shell/shell_messages.h"
#include "content/shell/shell_switches.h"
#include "content/shell/webkit_test_controller.h"
@@ -265,10 +265,10 @@ void Shell::DidNavigateMainFramePostCommit(WebContents* web_contents) {
PlatformSetAddressBarURL(web_contents->GetURL());
}
-JavaScriptDialogCreator* Shell::GetJavaScriptDialogCreator() {
- if (!dialog_creator_.get())
- dialog_creator_.reset(new ShellJavaScriptDialogCreator());
- return dialog_creator_.get();
+JavaScriptDialogManager* Shell::GetJavaScriptDialogManager() {
+ if (!dialog_manager_.get())
+ dialog_manager_.reset(new ShellJavaScriptDialogManager());
+ return dialog_manager_.get();
}
bool Shell::AddMessageToConsole(WebContents* source,
diff --git a/content/shell/shell.h b/content/shell/shell.h
index f342613..2a3ccd1 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -42,7 +42,7 @@ namespace content {
class BrowserContext;
class ShellDevToolsFrontend;
-class ShellJavaScriptDialogCreator;
+class ShellJavaScriptDialogManager;
class SiteInstance;
class WebContents;
@@ -122,7 +122,7 @@ class Shell : public WebContentsDelegate,
WebContents* new_contents) OVERRIDE;
virtual void DidNavigateMainFramePostCommit(
WebContents* web_contents) OVERRIDE;
- virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE;
+ virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
#if defined(OS_MACOSX)
virtual void HandleKeyboardEvent(
WebContents* source,
@@ -207,7 +207,7 @@ class Shell : public WebContentsDelegate,
GObject*, guint, GdkModifierType);
#endif
- scoped_ptr<ShellJavaScriptDialogCreator> dialog_creator_;
+ scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
scoped_ptr<WebContents> web_contents_;
diff --git a/content/shell/shell_javascript_dialog.h b/content/shell/shell_javascript_dialog.h
index 68fe2ea..b819f3b 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
diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/shell_javascript_dialog_gtk.cc
index 3fdaddd..624c222 100644
--- a/content/shell/shell_javascript_dialog_gtk.cc
+++ b/content/shell/shell_javascript_dialog_gtk.cc
@@ -11,7 +11,7 @@
#include "base/utf_string_conversions.h"
#include "content/shell/resource.h"
#include "content/shell/shell.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
namespace {
@@ -33,13 +33,13 @@ string16 GetPromptText(GtkDialog* dialog) {
namespace content {
ShellJavaScriptDialog::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)
- : creator_(creator),
+ const JavaScriptDialogManager::DialogClosedCallback& callback)
+ : manager_(manager),
callback_(callback),
parent_window_(parent_window) {
GtkButtonsType buttons = GTK_BUTTONS_NONE;
@@ -121,7 +121,7 @@ void ShellJavaScriptDialog::OnResponse(GtkWidget* dialog, int response_id) {
gtk_widget_destroy(dialog);
- creator_->DialogClosed(this);
+ manager_->DialogClosed(this);
}
} // namespace content
diff --git a/content/shell/shell_javascript_dialog_mac.mm b/content/shell/shell_javascript_dialog_mac.mm
index 1aa0840..920bb66 100644
--- a/content/shell/shell_javascript_dialog_mac.mm
+++ b/content/shell/shell_javascript_dialog_mac.mm
@@ -8,7 +8,7 @@
#import "base/memory/scoped_nsobject.h"
#include "base/sys_string_conversions.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
// Helper object that receives the notification that the dialog/sheet is
// going away. Is responsible for cleaning itself up.
@@ -18,12 +18,12 @@
NSTextField* textField_; // WEAK; owned by alert_
// Copies of the fields in ShellJavaScriptDialog because they're private.
- content::ShellJavaScriptDialogCreator* creator_;
- content::JavaScriptDialogCreator::DialogClosedCallback callback_;
+ content::ShellJavaScriptDialogManager* manager_;
+ content::JavaScriptDialogManager::DialogClosedCallback callback_;
}
-- (id)initHelperWithCreator:(content::ShellJavaScriptDialogCreator*)creator
- andCallback:(content::JavaScriptDialogCreator::DialogClosedCallback)callback;
+- (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
+ andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback;
- (NSAlert*)alert;
- (NSTextField*)textField;
- (void)alertDidEnd:(NSAlert*)alert
@@ -35,10 +35,10 @@
@implementation ShellJavaScriptDialogHelper
-- (id)initHelperWithCreator:(content::ShellJavaScriptDialogCreator*)creator
- andCallback:(content::JavaScriptDialogCreator::DialogClosedCallback)callback {
+- (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
+ andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback {
if (self = [super init]) {
- creator_ = creator;
+ manager_ = manager;
callback_ = callback;
}
@@ -73,7 +73,7 @@
content::ShellJavaScriptDialog* native_dialog =
reinterpret_cast<content::ShellJavaScriptDialog*>(contextInfo);
callback_.Run(success, input);
- creator_->DialogClosed(native_dialog);
+ manager_->DialogClosed(native_dialog);
}
- (void)cancel {
@@ -86,19 +86,19 @@
namespace content {
ShellJavaScriptDialog::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)
- : creator_(creator),
+ const JavaScriptDialogManager::DialogClosedCallback& callback)
+ : manager_(manager),
callback_(callback) {
bool text_field = message_type == JAVASCRIPT_MESSAGE_TYPE_PROMPT;
bool one_button = message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT;
helper_ =
- [[ShellJavaScriptDialogHelper alloc] initHelperWithCreator:creator
+ [[ShellJavaScriptDialogHelper alloc] initHelperWithManager:manager
andCallback:callback];
// Show the modal dialog.
diff --git a/content/shell/shell_javascript_dialog_creator.cc b/content/shell/shell_javascript_dialog_manager.cc
index 6013bfa..bb85a28 100644
--- a/content/shell/shell_javascript_dialog_creator.cc
+++ b/content/shell/shell_javascript_dialog_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
#include "base/command_line.h"
#include "base/logging.h"
@@ -16,13 +16,13 @@
namespace content {
-ShellJavaScriptDialogCreator::ShellJavaScriptDialogCreator() {
+ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() {
}
-ShellJavaScriptDialogCreator::~ShellJavaScriptDialogCreator() {
+ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {
}
-void ShellJavaScriptDialogCreator::RunJavaScriptDialog(
+void ShellJavaScriptDialogManager::RunJavaScriptDialog(
WebContents* web_contents,
const GURL& origin_url,
const std::string& accept_lang,
@@ -71,7 +71,7 @@ void ShellJavaScriptDialogCreator::RunJavaScriptDialog(
#endif
}
-void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog(
+void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
WebContents* web_contents,
const string16& message_text,
bool is_reload,
@@ -118,7 +118,7 @@ void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog(
#endif
}
-void ShellJavaScriptDialogCreator::ResetJavaScriptState(
+void ShellJavaScriptDialogManager::ResetJavaScriptState(
WebContents* web_contents) {
#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
if (dialog_.get()) {
@@ -130,7 +130,7 @@ void ShellJavaScriptDialogCreator::ResetJavaScriptState(
#endif
}
-void ShellJavaScriptDialogCreator::DialogClosed(ShellJavaScriptDialog* dialog) {
+void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
#if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
DCHECK_EQ(dialog, dialog_.get());
dialog_.reset();
diff --git a/content/shell/shell_javascript_dialog_creator.h b/content/shell/shell_javascript_dialog_manager.h
index 55fd548..8ec82be 100644
--- a/content/shell/shell_javascript_dialog_creator.h
+++ b/content/shell/shell_javascript_dialog_manager.h
@@ -2,24 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_CREATOR_H_
-#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_CREATOR_H_
+#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
+#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
-#include "base/compiler_specific.h"
#include "base/callback_forward.h"
+#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
namespace content {
class ShellJavaScriptDialog;
-class ShellJavaScriptDialogCreator : public JavaScriptDialogCreator {
+class ShellJavaScriptDialogManager : public JavaScriptDialogManager {
public:
- ShellJavaScriptDialogCreator();
- virtual ~ShellJavaScriptDialogCreator();
+ ShellJavaScriptDialogManager();
+ virtual ~ShellJavaScriptDialogManager();
- // JavaScriptDialogCreator:
+ // JavaScriptDialogManager:
virtual void RunJavaScriptDialog(
WebContents* web_contents,
const GURL& origin_url,
@@ -56,9 +56,9 @@ class ShellJavaScriptDialogCreator : public JavaScriptDialogCreator {
base::Closure dialog_request_callback_;
- DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogCreator);
+ DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager);
};
} // namespace content
-#endif // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_CREATOR_H_
+#endif // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc
index 93c78da..08ca91c 100644
--- a/content/shell/shell_javascript_dialog_win.cc
+++ b/content/shell/shell_javascript_dialog_win.cc
@@ -7,7 +7,7 @@
#include "base/string_util.h"
#include "content/shell/resource.h"
#include "content/shell/shell.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
namespace content {
@@ -35,7 +35,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog,
if (owner->dialog_win_) {
owner->dialog_win_ = 0;
owner->callback_.Run(false, string16());
- owner->creator_->DialogClosed(owner);
+ owner->manager_->DialogClosed(owner);
}
break;
}
@@ -65,7 +65,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog,
owner->dialog_win_ = 0;
owner->callback_.Run(result, user_input);
DestroyWindow(dialog);
- owner->creator_->DialogClosed(owner);
+ owner->manager_->DialogClosed(owner);
}
break;
}
@@ -76,13 +76,13 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog,
}
ShellJavaScriptDialog::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)
- : creator_(creator),
+ const JavaScriptDialogManager::DialogClosedCallback& callback)
+ : manager_(manager),
callback_(callback),
message_text_(message_text),
default_prompt_text_(default_prompt_text),
generated by cgit v1.1 at 2025-03-29 22:12:17 +0000