diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 20:55:15 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-23 20:55:15 +0000 |
| commit | 91c7fcaec1bec76a05d938e4e436d1efaa7eee8c (patch) | |
| tree | e1173aa6da34adda9034cae6d13bc5dba8c6a6c5 /chrome/browser/message_box_handler.cc | |
| parent | ca25209a0338e538e0199b07bbd5c2411f52e906 (diff) | |
| download | chromium_src-91c7fcaec1bec76a05d938e4e436d1efaa7eee8c.zip chromium_src-91c7fcaec1bec76a05d938e4e436d1efaa7eee8c.tar.gz chromium_src-91c7fcaec1bec76a05d938e4e436d1efaa7eee8c.tar.bz2 | |
Revert 39756 - Mac: Cookie confirmation dialog.
This is not the final UI (the "more info" disclosure triangle is missing), but it's pretty close and, more importantly, functional.
BUG=34894
TEST=Go to Preferences>under the hood>content settings>cookies and select "ask me every time". Then browser around and note that a message box pops up all the time. All the buttons on the message box should do what they claim.
Review URL: http://codereview.chromium.org/650206
TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/652150
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/message_box_handler.cc')
| -rw-r--r-- | chrome/browser/message_box_handler.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/message_box_handler.cc b/chrome/browser/message_box_handler.cc index a92bbf7..3c249d2 100644 --- a/chrome/browser/message_box_handler.cc +++ b/chrome/browser/message_box_handler.cc @@ -63,12 +63,13 @@ void RunCookiePrompt(TabContents* tab_contents, const GURL& origin, const std::string& cookie_line, CookiePromptModalDialogDelegate* delegate) { -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_WIN) Singleton<AppModalDialogQueue>()->AddDialog( new CookiePromptModalDialog(tab_contents, host_content_settings_map, origin, cookie_line, delegate)); #else // Linux: http://crbug.com/35178 + // Mac: http://crbug.com/34894 NOTIMPLEMENTED(); delegate->BlockSiteData(); #endif @@ -81,12 +82,13 @@ void RunLocalStoragePrompt( const string16& key, const string16& value, CookiePromptModalDialogDelegate* delegate) { -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_WIN) Singleton<AppModalDialogQueue>()->AddDialog( new CookiePromptModalDialog(tab_contents, host_content_settings_map, origin, key, value, delegate)); #else // Linux: http://crbug.com/35178 + // Mac: http://crbug.com/34894 NOTIMPLEMENTED(); delegate->BlockSiteData(); #endif @@ -98,12 +100,13 @@ void RunDatabasePrompt( const GURL& origin, const string16& database_name, CookiePromptModalDialogDelegate* delegate) { -#if defined(OS_WIN) || defined(OS_MACOSX) +#if defined(OS_WIN) Singleton<AppModalDialogQueue>()->AddDialog( new CookiePromptModalDialog(tab_contents, host_content_settings_map, origin, database_name, delegate)); #else // Linux: http://crbug.com/35178 + // Mac: http://crbug.com/34894 NOTIMPLEMENTED(); delegate->BlockSiteData(); #endif |