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

Unified Diff: chrome/browser/ui/views/collected_cookies_views.cc

Issue 10709006: Show apps protecting local data in chrome://settings/cookies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: argh 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
« no previous file with comments | « chrome/browser/ui/gtk/collected_cookies_gtk.cc ('k') | chrome/browser/ui/webui/cookies_tree_model_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/collected_cookies_views.cc
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 9227cb6e0a746444a42cb79c2b7d8708b9c6ca02..ab36bf5472a9ce1de5abf7250eecf408fc6b8d49 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -345,7 +345,7 @@ views::View* CollectedCookiesViews::CreateAllowedPane() {
NULL,
allowed_lsos.server_bound_certs()->Clone());
- allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, true));
+ allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true));
allowed_cookies_tree_ = new views::TreeView();
allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());
allowed_cookies_tree_->SetRootShown(false);
@@ -417,7 +417,7 @@ views::View* CollectedCookiesViews::CreateBlockedPane() {
NULL,
blocked_lsos.server_bound_certs()->Clone());
- blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, true));
+ blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true));
blocked_cookies_tree_ = new views::TreeView();
blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());
blocked_cookies_tree_->SetRootShown(false);
@@ -475,8 +475,8 @@ void CollectedCookiesViews::EnableControls() {
if (node) {
CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
if (cookie_node->GetDetailedInfo().node_type ==
- CookieTreeNode::DetailedInfo::TYPE_ORIGIN) {
- enable_allowed_buttons = static_cast<CookieTreeOriginNode*>(
+ CookieTreeNode::DetailedInfo::TYPE_HOST) {
+ enable_allowed_buttons = static_cast<CookieTreeHostNode*>(
cookie_node)->CanCreateContentException();
}
}
@@ -487,8 +487,8 @@ void CollectedCookiesViews::EnableControls() {
if (node) {
CookieTreeNode* cookie_node = static_cast<CookieTreeNode*>(node);
if (cookie_node->GetDetailedInfo().node_type ==
- CookieTreeNode::DetailedInfo::TYPE_ORIGIN) {
- enable_blocked_buttons = static_cast<CookieTreeOriginNode*>(
+ CookieTreeNode::DetailedInfo::TYPE_HOST) {
+ enable_blocked_buttons = static_cast<CookieTreeHostNode*>(
cookie_node)->CanCreateContentException();
}
}
@@ -519,12 +519,12 @@ void CollectedCookiesViews::ShowCookieInfo() {
void CollectedCookiesViews::AddContentException(views::TreeView* tree_view,
ContentSetting setting) {
- CookieTreeOriginNode* origin_node =
- static_cast<CookieTreeOriginNode*>(tree_view->GetSelectedNode());
+ CookieTreeHostNode* host_node =
+ static_cast<CookieTreeHostNode*>(tree_view->GetSelectedNode());
Profile* profile = tab_contents_->profile();
- origin_node->CreateContentException(
+ host_node->CreateContentException(
CookieSettings::Factory::GetForProfile(profile), setting);
- infobar_->UpdateVisibility(true, setting, origin_node->GetTitle());
+ infobar_->UpdateVisibility(true, setting, host_node->GetTitle());
status_changed_ = true;
}
« no previous file with comments | « chrome/browser/ui/gtk/collected_cookies_gtk.cc ('k') | chrome/browser/ui/webui/cookies_tree_model_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698