summaryrefslogtreecommitdiffstats
path: root/chrome/browser/js_modal_dialog.h
diff options
context:
space:
mode:
authordanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 06:54:09 +0000
committerdanno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-12 06:54:09 +0000
commitd0edf4e5adf877515ff49a59f63600fd88a25b36 (patch)
treead789884b7918146fcbcddaf4f10284836ff3496 /chrome/browser/js_modal_dialog.h
parent5fed0f1c5195ded63dfadadeb93c0b1d006f1fb4 (diff)
downloadchromium_src-d0edf4e5adf877515ff49a59f63600fd88a25b36.zip
chromium_src-d0edf4e5adf877515ff49a59f63600fd88a25b36.tar.gz
chromium_src-d0edf4e5adf877515ff49a59f63600fd88a25b36.tar.bz2
[Mac] augment modal cookie prompt on mac to include details pane
Added two new xibs. The first is a cookie info view that is shared between the tree that shows browser data and the cookie modal prompt to block accepting cookies. The second is a window to replace the NSAlert modal dialog for the cookie prompt. Modified cookie tree code and added cookie prompt code to use new xibs. Changed "hidden" handling of cookie detail view to use bindings rather than explicit code. TODOs for http://crbug.com/36948 not in this CL: - changing the expiration for cookies isn't implemented TEST=manually testing of modal cookie prompt, new unit tests BUG=http://crbug.com/36948 Review URL: http://codereview.chromium.org/669127 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/js_modal_dialog.h')
-rw-r--r--chrome/browser/js_modal_dialog.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome/browser/js_modal_dialog.h b/chrome/browser/js_modal_dialog.h
index 51b9c81..65ed1ae 100644
--- a/chrome/browser/js_modal_dialog.h
+++ b/chrome/browser/js_modal_dialog.h
@@ -13,6 +13,14 @@
#include "chrome/common/notification_registrar.h"
#include "net/base/cookie_monster.h"
+#if defined(OS_MACOSX)
+#if __OBJC__
+@class NSAlert;
+#else
+class NSAlert;
+#endif
+#endif
+
class ExtensionHost;
class JavaScriptMessageBoxClient;
@@ -56,6 +64,10 @@ class JavaScriptAppModalDialog : public AppModalDialog,
return is_before_unload_dialog_;
}
+#if defined(OS_MACOSX)
+ virtual void CloseModalDialog();
+#endif
+
// Callbacks from NativeDialog when the user accepts or cancels the dialog.
void OnCancel();
void OnAccept(const std::wstring& prompt_text, bool suppress_js_messages);
@@ -75,6 +87,10 @@ class JavaScriptAppModalDialog : public AppModalDialog,
// Initializes for notifications to listen.
void InitNotifications();
+#if defined(OS_MACOSX)
+ NSAlert* dialog_;
+#endif
+
NotificationRegistrar registrar_;
// An implementation of the client interface to provide supporting methods