diff options
author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 09:41:25 +0000 |
---|---|---|
committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-19 09:41:25 +0000 |
commit | cc2724b7c0fa92466b26eca1e8851d53ab0649b4 (patch) | |
tree | c9956e77301cf2c7df0e1194db0d7f9735ccda87 /chrome/browser | |
parent | cbd426185e5893b46084922ea4c6c766cd94bc26 (diff) | |
download | chromium_src-cc2724b7c0fa92466b26eca1e8851d53ab0649b4.zip chromium_src-cc2724b7c0fa92466b26eca1e8851d53ab0649b4.tar.gz chromium_src-cc2724b7c0fa92466b26eca1e8851d53ab0649b4.tar.bz2 |
compile fix.
accidentally committed an old version.
tbr=jochen
Review URL: http://codereview.chromium.org/3044010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/cookies_tree_model.cc | 11 | ||||
-rw-r--r-- | chrome/browser/cookies_tree_model.h | 13 |
2 files changed, 13 insertions, 11 deletions
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index a51d2cb..fad1e47 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -237,11 +237,12 @@ CookieTreeAppCachesNode* CookieTreeOriginNode::GetOrCreateAppCachesNode() { return appcaches_child_; } -void CookieTreeOriginNode::CreateContentException() { -// profile_->GetHostContentSettingsMap()->AddExceptionForURL( -// , -// CONTENT_, -// radio_index == 0 ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK); +void CookieTreeOriginNode::CreateContentException( + HostContentSettingsMap* content_settings, ContentSetting setting) { + std::wstring title(GetTitle()); + content_settings->AddExceptionForURL(GURL(WideToUTF16(title)), + CONTENT_SETTINGS_TYPE_COOKIES, + setting); } /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h index 1a07785..9019884 100644 --- a/chrome/browser/cookies_tree_model.h +++ b/chrome/browser/cookies_tree_model.h @@ -149,14 +149,15 @@ class CookieTreeOriginNode : public CookieTreeNode { CookieTreeDatabasesNode* GetOrCreateDatabasesNode(); CookieTreeLocalStoragesNode* GetOrCreateLocalStoragesNode(); CookieTreeAppCachesNode* GetOrCreateAppCachesNode(); + void CreateContentException(HostContentSettingsMap* content_settings, + ContentSetting setting); private: - // A pointer to the COOKIES node. Eventually we will also have database, - // appcache, local storage, ..., and when we build up the tree we need to - // quickly get a reference to the COOKIES node to add children. Checking each - // child and interrogating them to see if they are a COOKIES, APPCACHES, - // DATABASES etc node seems less preferable than storing an extra pointer per - // origin. + // Pointers to the cookies, databases, local storage and appcache nodes. + // When we build up the tree we need to quickly get a reference to the COOKIES + // node to add children. Checking each child and interrogating them to see if + // they are a COOKIES, APPCACHES, DATABASES etc node seems less preferable + // than storing an extra pointer per origin. CookieTreeCookiesNode* cookies_child_; CookieTreeDatabasesNode* databases_child_; CookieTreeLocalStoragesNode* local_storages_child_; |