When we're initializing the modal dialog box which asks whether the page has permission to access a "cookie", double check that the value has not since been set. If it has, close the window before it's even shown.

This is a stop-gap solution.  We should probably come up with something more elegent long term.

TEST=Go to a page that starts a database transaction and immediately sets a local storage value.  You should get one prompt instead of 2.
BUG=36006


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

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

1 files changed, 0 insertions, 18 deletions

diff --git a/chrome/browser/net/chrome_cookie_policy.h b/chrome/browser/net/chrome_cookie_policy.h
index 40138a2..ae60764 100644
--- a/chrome/browser/net/chrome_cookie_policy.h
+++ b/chrome/browser/net/chrome_cookie_policy.h
@@ -66,19 +66,7 @@ class ChromeCookiePolicy
   typedef std::vector<Completion> Completions;
   typedef std::map<std::string, Completions> HostCompletionsMap;
 
-  struct PromptData {
-    GURL url;
-    std::string cookie_line;
-
-    PromptData(const GURL& url, const std::string& cookie_line)
-        : url(url),
-          cookie_line(cookie_line) {
-    }
-  };
-  typedef std::queue<PromptData> PromptQueue;
-
   int CheckPolicy(const GURL& url) const;
-  void ShowNextPrompt();
   void PromptForSetCookie(const GURL& url, const std::string& cookie_line);
   void DidPromptForSetCookie(const std::string& host, int result,
                              bool remember);
@@ -87,12 +75,6 @@ class ChromeCookiePolicy
   // This map is only accessed on the IO thread.
   HostCompletionsMap host_completions_map_;
 
-  // A queue of pending prompts.  We queue these up here so that before showing
-  // the next prompt we can reconsult the HostContentSettingsMap in case
-  // settings have changed since the prompt request was placed in the queue.
-  // This queue is only accessed on the UI thread.
-  PromptQueue prompt_queue_;
-
   scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
 };