Adding CookieSettings for storing cookie content settings.

chrome/browser/profiles/profile_io_data.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <set>
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/resource_context.h"
 #include "net/base/cookie_monster.h"
 
 class CommandLine;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
+class CookieSettings;
 class DesktopNotificationService;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
 class HostZoomMap;
 class IOThread;
 class Profile;
 class ProtocolHandlerRegistry;
 class TransportSecurityPersister;
 
 namespace fileapi {
@@ skipping 58 matching lines @@
   scoped_refptr<ChromeURLRequestContext> GetExtensionsRequestContext() const;
   scoped_refptr<ChromeURLRequestContext> GetIsolatedAppRequestContext(
       scoped_refptr<ChromeURLRequestContext> main_context,
       const std::string& app_id) const;
 
   // These are useful when the Chrome layer is called from the content layer
   // with a content::ResourceContext, and they want access to Chrome data for
   // that profile.
   ExtensionInfoMap* GetExtensionInfoMap() const;
   HostContentSettingsMap* GetHostContentSettingsMap() const;
+  CookieSettings* GetCookieSettings() const;

[Bernhard Bauer, 2011/10/25 13:14:23]

Where is this method actually called?

[marja, 2011/10/26 13:03:21]

This should've been called by ContentSettingsHandler; I fixed it so that it
really does call it.

[Bernhard Bauer, 2011/10/26 13:24:09]

Does it? ContentSettingsHandler seems to get the CookieSettings from the Profile
(as it lives on the UI thread anyway). I think this method here is unnecessary.

[marja, 2011/10/27 08:48:51]

Oops, not ContentSettingsHandler. This one is called by
ChromeWorkerMessageFilter, and it used to get the HostContentSettingsMap the
same way when it used it.

[Bernhard Bauer, 2011/10/27 09:27:05]

Ah, OK then.

   DesktopNotificationService* GetNotificationService() const;
 
   BooleanPrefMember* clear_local_state_on_exit()  const {
     return &clear_local_state_on_exit_;
   }
 
   ChromeURLRequestContext* extensions_request_context() const {
     return extensions_request_context_.get();
   }
 
@@ skipping 26 matching lines @@
     ~ProfileParams();
 
     FilePath path;
     bool is_incognito;
     bool clear_local_state_on_exit;
     std::string accept_language;
     std::string accept_charset;
     std::string referrer_charset;
     IOThread* io_thread;
     scoped_refptr<HostContentSettingsMap> host_content_settings_map;
+    scoped_refptr<CookieSettings> cookie_settings;
     scoped_refptr<HostZoomMap> host_zoom_map;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
     scoped_refptr<webkit_database::DatabaseTracker> database_tracker;
     scoped_refptr<ChromeAppCacheService> appcache_service;
     scoped_refptr<ChromeBlobStorageContext> blob_storage_context;
     scoped_refptr<fileapi::FileSystemContext> file_system_context;
     scoped_refptr<quota::QuotaManager> quota_manager;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
     DesktopNotificationService* notification_service;
@@ skipping 133 matching lines @@
   mutable scoped_refptr<ChromeBlobStorageContext> blob_storage_context_;
   mutable scoped_refptr<fileapi::FileSystemContext> file_system_context_;
   mutable scoped_refptr<quota::QuotaManager> quota_manager_;
   mutable scoped_refptr<HostZoomMap> host_zoom_map_;
   mutable DownloadManager::GetNextIdThunkType next_download_id_thunk_;
   mutable scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
 
   // TODO(willchan): Remove from ResourceContext.
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
+  mutable scoped_refptr<CookieSettings> cookie_settings_;
   mutable DesktopNotificationService* notification_service_;
 
   mutable ResourceContext resource_context_;
 
   mutable scoped_ptr<TransportSecurityPersister>
       transport_security_persister_;
 
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
   mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
   // One AppRequestContext per isolated app.
   mutable AppRequestContextMap app_request_context_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_