diff options
author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 06:54:09 +0000 |
---|---|---|
committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 06:54:09 +0000 |
commit | d0edf4e5adf877515ff49a59f63600fd88a25b36 (patch) | |
tree | ad789884b7918146fcbcddaf4f10284836ff3496 /chrome/browser/app_modal_dialog.h | |
parent | 5fed0f1c5195ded63dfadadeb93c0b1d006f1fb4 (diff) | |
download | chromium_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/app_modal_dialog.h')
-rw-r--r-- | chrome/browser/app_modal_dialog.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/app_modal_dialog.h b/chrome/browser/app_modal_dialog.h index 6567db8..92ac494 100644 --- a/chrome/browser/app_modal_dialog.h +++ b/chrome/browser/app_modal_dialog.h @@ -17,12 +17,7 @@ class ModalDialogDelegate; typedef ModalDialogDelegate* NativeDialog; #elif defined(OS_MACOSX) -#if __OBJC__ -@class NSAlert; -#else -class NSAlert; -#endif -typedef NSAlert* NativeDialog; +typedef void* NativeDialog; #elif defined(TOOLKIT_USES_GTK) typedef struct _GtkDialog GtkDialog; typedef struct _GtkWidget GtkWidget; @@ -71,7 +66,7 @@ class AppModalDialog { #endif // Close the dialog if it is showing. - void CloseModalDialog(); + virtual void CloseModalDialog(); // Called by the app modal window queue to activate the window. void ActivateModalDialog(); @@ -97,7 +92,9 @@ class AppModalDialog { virtual NativeDialog CreateNativeDialog() = 0; // A reference to the platform native dialog box. +#if defined(OS_LINUX) || defined(OS_WIN) NativeDialog dialog_; +#endif // Parent tab contents. TabContents* tab_contents_; |