Make the setItem CONTENT_SETTING_ASK dialog more useful by showing the actual key and value. Unfortunately, we're going to have to abuse cookie strings for 4.1 Once this goes in, I'll add new strings for the actual fields.

This also cleans up the code some.

TEST=Instead of size/modified information you'll see "name" and "content" in the dialog that comes up when asking whether to allow local storage.
BUG=none

Review URL: http://codereview.chromium.org/597061

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38952 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/message_box_handler.cc b/chrome/browser/message_box_handler.cc
index b1c33a7..4a2d19f 100644
--- a/chrome/browser/message_box_handler.cc
+++ b/chrome/browser/message_box_handler.cc
@@ -60,20 +60,22 @@ void RunBeforeUnloadDialog(TabContents* tab_contents,
 
 #if defined(OS_WIN)
 void RunCookiePrompt(TabContents* tab_contents,
-                     const std::string& host,
+                     const GURL& origin,
                      const std::string& cookie_line,
                      CookiePromptModalDialogDelegate* delegate) {
   Singleton<AppModalDialogQueue>()->AddDialog(
-      new CookiePromptModalDialog(tab_contents, host, cookie_line, delegate));
+      new CookiePromptModalDialog(tab_contents, origin, cookie_line, delegate));
 }
 
 
 void RunLocalStoragePrompt(
     TabContents* tab_contents,
-    const BrowsingDataLocalStorageHelper::LocalStorageInfo& local_storage_info,
+    const GURL& origin,
+    const string16& key,
+    const string16& value,
     CookiePromptModalDialogDelegate* delegate) {
   Singleton<AppModalDialogQueue>()->AddDialog(
-      new CookiePromptModalDialog(tab_contents, local_storage_info, delegate));
+      new CookiePromptModalDialog(tab_contents, origin, key, value, delegate));
 }
 #endif