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

Unified Diff: content/shell/shell_javascript_dialog_mac.mm

Issue 12082123: Rename JavaScriptDialogCreator to JavaScriptDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 11 months 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/shell_javascript_dialog_gtk.cc ('k') | content/shell/shell_javascript_dialog_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_javascript_dialog_mac.mm
diff --git a/content/shell/shell_javascript_dialog_mac.mm b/content/shell/shell_javascript_dialog_mac.mm
index 1aa08408c239f78de4337a36e90548d1997a8855..920bb6642877f10003c119f24929b17acad25736 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.
« no previous file with comments | « content/shell/shell_javascript_dialog_gtk.cc ('k') | content/shell/shell_javascript_dialog_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698