Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4884)

Unified Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm

Issue 10709006: Show apps protecting local data in chrome://settings/cookies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
index ade45b5adbbdd1efe4d7b727525cf2410d40b563..0a19669d8de5fdef9974d5325812e7c5002bb48d 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm
@@ -264,17 +264,17 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
CocoaCookieTreeNode* node = [treeNode representedObject];
CookieTreeNode* cookie = static_cast<CookieTreeNode*>([node treeNode]);
if (cookie->GetDetailedInfo().node_type !=
- CookieTreeNode::DetailedInfo::TYPE_ORIGIN) {
+ CookieTreeNode::DetailedInfo::TYPE_HOST) {
continue;
}
Profile* profile = tab_contents_->profile();
- CookieTreeOriginNode* origin_node =
- static_cast<CookieTreeOriginNode*>(cookie);
- origin_node->CreateContentException(
+ CookieTreeHostNode* host_node =
+ static_cast<CookieTreeHostNode*>(cookie);
+ host_node->CreateContentException(
CookieSettings::Factory::GetForProfile(profile), setting);
if (!lastDomain.empty())
multipleDomainsChanged = YES;
- lastDomain = origin_node->GetTitle();
+ lastDomain = host_node->GetTitle();
}
if (multipleDomainsChanged)
[self showInfoBarForMultipleDomainsAndSetting:setting];
@@ -357,12 +357,12 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
CocoaCookieTreeNode* node = [treeNode representedObject];
CookieTreeNode* cookie = static_cast<CookieTreeNode*>([node treeNode]);
if (cookie->GetDetailedInfo().node_type !=
- CookieTreeNode::DetailedInfo::TYPE_ORIGIN) {
+ CookieTreeNode::DetailedInfo::TYPE_HOST) {
continue;
}
- CookieTreeOriginNode* origin_node =
- static_cast<CookieTreeOriginNode*>(cookie);
- if (origin_node->CanCreateContentException()) {
+ CookieTreeHostNode* host_node =
+ static_cast<CookieTreeHostNode*>(cookie);
+ if (host_node->CanCreateContentException()) {
if (isAllowedOutlineView) {
[self setAllowedCookiesButtonsEnabled:YES];
} else {
@@ -396,6 +396,7 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
allowed_lsos.file_systems()->Clone(),
NULL,
allowed_lsos.server_bound_certs()->Clone(),
+ NULL,
true));
const LocalSharedObjectsContainer& blocked_lsos =
content_settings->blocked_local_shared_objects();
@@ -409,6 +410,7 @@ void CollectedCookiesMac::OnSheetDidEnd(NSWindow* sheet) {
blocked_lsos.file_systems()->Clone(),
NULL,
blocked_lsos.server_bound_certs()->Clone(),
+ NULL,
true));
// Convert the model's icons from Skia to Cocoa.

Powered by Google App Engine
This is Rietveld 408576698