More progress towards removing content settings code from the content layer. We can't use Cookie...

chrome/browser/chrome_content_browser_client.h

Index: chrome/browser/chrome_content_browser_client.h
===================================================================
--- chrome/browser/chrome_content_browser_client.h	(revision 84586)
+++ chrome/browser/chrome_content_browser_client.h	(working copy)
@@ -27,7 +27,20 @@
                                               int child_process_id);
   virtual std::string GetApplicationLocale();
   virtual bool AllowAppCache(const GURL& manifest_url,
-                             const content::ResourceContext* context);
+                             const content::ResourceContext& context);
+  virtual bool AllowGetCookie(const GURL& url,
+                              const GURL& first_party,
+                              const net::CookieList& cookie_list,
+                              const content::ResourceContext& context,
+                              int render_process_id,
+                              int render_view_id);

[willchan no longer on Chromium, 2011/05/10 18:36:56]

Nit: I leave it up to you, but I think the recommended practice nowadays may be
to add a OVERRIDE at the end of these declarations, so that no one subclasses
this and re-overrides the member function. OVERRIDE is defined in
base/compiler_specific.h.

[jam, 2011/05/10 19:27:22]

I thought the point is to guard against the base class' function changes, and
people forgetting to update derived classes.  I've grown to see the benefit of
it recently, but I find in these embedding APIs, where there's only one
implementation of the interface, it's not necessary since there's only one
place.  If someone changes ContentBrowserClient, they surely are doing it for
ChroemContentBrowserClient.

[willchan no longer on Chromium, 2011/05/10 22:39:22]

That's a perfectly valid opinion and I think it makes sense.

On 2011/05/10 19:27:22, John Abd-El-Malek wrote:

+  virtual bool AllowSetCookie(const GURL& url,
+                              const GURL& first_party,
+                              const std::string& cookie_line,
+                              net::CookieOptions* options,
+                              const content::ResourceContext& context,
+                              int render_process_id,
+                              int render_view_id);
 #if defined(OS_LINUX)
   // Can return an optional fd for crash handling, otherwise returns -1.
   virtual int GetCrashSignalFD(const std::string& process_type);