[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

1 files changed, 17 insertions, 0 deletions

diff --git a/chrome/browser/cookie_modal_dialog.h b/chrome/browser/cookie_modal_dialog.h
index 7a6ae50..997dd7f 100644
--- a/chrome/browser/cookie_modal_dialog.h
+++ b/chrome/browser/cookie_modal_dialog.h
@@ -13,6 +13,14 @@
 #include "chrome/browser/cookie_prompt_modal_dialog_delegate.h"
 #include "googleurl/src/gurl.h"
 
+#if defined(OS_MACOSX)
+#if __OBJC__
+@class NSWindow;
+#else
+class NSWindow;
+#endif
+#endif
+
 class HostContentSettingsMap;
 class PrefService;
 
@@ -58,6 +66,10 @@ class CookiePromptModalDialog : public AppModalDialog {
   virtual void CancelWindow();
   virtual bool IsValid();
 
+#if defined(OS_MACOSX)
+  virtual void CloseModalDialog();
+#endif
+
   DialogType dialog_type() const { return dialog_type_; }
   const GURL& origin() const { return origin_; }
   const std::string& cookie_line() const { return cookie_line_; }
@@ -78,6 +90,11 @@ class CookiePromptModalDialog : public AppModalDialog {
 #endif
 
  private:
+
+#if defined(OS_MACOSX)
+  NSWindow* dialog_;
+#endif
+
   // Used to verify our request is still necessary and when the response should
   // persist.
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;