| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/browsing_data/cookies_tree_model.h" | 5 #include "chrome/browser/browsing_data/cookies_tree_model.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <functional> | 10 #include <functional> |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 } | 758 } |
| 759 | 759 |
| 760 void CookieTreeHostNode::CreateContentException( | 760 void CookieTreeHostNode::CreateContentException( |
| 761 content_settings::CookieSettings* cookie_settings, | 761 content_settings::CookieSettings* cookie_settings, |
| 762 ContentSetting setting) const { | 762 ContentSetting setting) const { |
| 763 DCHECK(setting == CONTENT_SETTING_ALLOW || | 763 DCHECK(setting == CONTENT_SETTING_ALLOW || |
| 764 setting == CONTENT_SETTING_BLOCK || | 764 setting == CONTENT_SETTING_BLOCK || |
| 765 setting == CONTENT_SETTING_SESSION_ONLY); | 765 setting == CONTENT_SETTING_SESSION_ONLY); |
| 766 if (CanCreateContentException()) { | 766 if (CanCreateContentException()) { |
| 767 cookie_settings->ResetCookieSetting(url_); | 767 cookie_settings->ResetCookieSetting(url_); |
| 768 cookie_settings->SetCookieSetting( | 768 cookie_settings->SetCookieSetting(url_, setting); |
| 769 ContentSettingsPattern::FromURL(url_), | |
| 770 ContentSettingsPattern::Wildcard(), setting); | |
| 771 } | 769 } |
| 772 } | 770 } |
| 773 | 771 |
| 774 bool CookieTreeHostNode::CanCreateContentException() const { | 772 bool CookieTreeHostNode::CanCreateContentException() const { |
| 775 return !url_.SchemeIsFile(); | 773 return !url_.SchemeIsFile(); |
| 776 } | 774 } |
| 777 | 775 |
| 778 /////////////////////////////////////////////////////////////////////////////// | 776 /////////////////////////////////////////////////////////////////////////////// |
| 779 // CookieTreeCookiesNode, public: | 777 // CookieTreeCookiesNode, public: |
| 780 | 778 |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1545 void CookiesTreeModel::MaybeNotifyBatchesEnded() { | 1543 void CookiesTreeModel::MaybeNotifyBatchesEnded() { |
| 1546 // Only notify the observers if this is the outermost call to EndBatch() if | 1544 // Only notify the observers if this is the outermost call to EndBatch() if |
| 1547 // called in a nested manner. | 1545 // called in a nested manner. |
| 1548 if (batches_ended_ == batches_started_ && | 1546 if (batches_ended_ == batches_started_ && |
| 1549 batches_seen_ == batches_expected_) { | 1547 batches_seen_ == batches_expected_) { |
| 1550 FOR_EACH_OBSERVER(Observer, | 1548 FOR_EACH_OBSERVER(Observer, |
| 1551 cookies_observer_list_, | 1549 cookies_observer_list_, |
| 1552 TreeModelEndBatch(this)); | 1550 TreeModelEndBatch(this)); |
| 1553 } | 1551 } |
| 1554 } | 1552 } |
| OLD | NEW |