Show apps protecting local data in chrome://settings/cookies.

chrome/browser/ui/gtk/collected_cookies_gtk.cc

Index: chrome/browser/ui/gtk/collected_cookies_gtk.cc
diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
index 2b233df9959a70e05d2e4af12e5f4ebc8aeaaba1..8ffdce1b403ae55c16d3f7a206ef0c6d4fabc06f 100644
--- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc
+++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc
@@ -223,6 +223,7 @@ GtkWidget* CollectedCookiesGtk::CreateAllowedPane() {
                            allowed_lsos.file_systems()->Clone(),
                            NULL,
                            allowed_lsos.server_bound_certs()->Clone(),
+                           NULL,

[marja, 2012/07/09 08:11:43]

Why NULL here?

[Bernhard Bauer, 2012/07/09 09:50:48]

At the moment we don't have UI in the collected cookies dialog to show this
information, and I'm not sure if it's worth adding some (it would probably make
more sense to show a general indication that we're in the context of an app
here).

                            true));
   allowed_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get()));
@@ -312,6 +313,7 @@ GtkWidget* CollectedCookiesGtk::CreateBlockedPane() {
                            blocked_lsos.file_systems()->Clone(),
                            NULL,
                            blocked_lsos.server_bound_certs()->Clone(),
+                           NULL,
                            true));
   blocked_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get()));
@@ -422,13 +424,13 @@ void CollectedCookiesGtk::DeleteDelegate() {
   delete this;
 }
 
-bool CollectedCookiesGtk::SelectionContainsOriginNode(
+bool CollectedCookiesGtk::SelectionContainsHostNode(
     GtkTreeSelection* selection, gtk_tree::TreeAdapter* adapter) {
   // Check whether at least one "origin" node is selected.
   GtkTreeModel* model;
   GList* paths =
       gtk_tree_selection_get_selected_rows(selection, &model);
-  bool contains_origin_node = false;
+  bool contains_host_node = false;
   for (GList* item = paths; item; item = item->next) {
     GtkTreeIter iter;
     gtk_tree_model_get_iter(
@@ -436,29 +438,29 @@ bool CollectedCookiesGtk::SelectionContainsOriginNode(
     CookieTreeNode* node =
         static_cast<CookieTreeNode*>(adapter->GetNode(&iter));
     if (node->GetDetailedInfo().node_type !=
-        CookieTreeNode::DetailedInfo::TYPE_ORIGIN)
+        CookieTreeNode::DetailedInfo::TYPE_HOST)
       continue;
-    CookieTreeOriginNode* origin_node = static_cast<CookieTreeOriginNode*>(
+    CookieTreeHostNode* host_node = static_cast<CookieTreeHostNode*>(
         node);
-    if (!origin_node->CanCreateContentException())
+    if (!host_node->CanCreateContentException())
       continue;
-    contains_origin_node = true;
+    contains_host_node = true;
   }
   g_list_foreach(paths, reinterpret_cast<GFunc>(gtk_tree_path_free), NULL);
   g_list_free(paths);
-  return contains_origin_node;
+  return contains_host_node;
 }
 
 void CollectedCookiesGtk::EnableControls() {
   // Update button states.
   bool enable_for_allowed_cookies =
-      SelectionContainsOriginNode(allowed_selection_,
+      SelectionContainsHostNode(allowed_selection_,
                                   allowed_cookies_tree_adapter_.get());
   gtk_widget_set_sensitive(block_allowed_cookie_button_,
                            enable_for_allowed_cookies);
 
   bool enable_for_blocked_cookies =
-      SelectionContainsOriginNode(blocked_selection_,
+      SelectionContainsHostNode(blocked_selection_,
                                   blocked_cookies_tree_adapter_.get());
   gtk_widget_set_sensitive(allow_blocked_cookie_button_,
                            enable_for_blocked_cookies);
@@ -497,16 +499,16 @@ void CollectedCookiesGtk::AddExceptions(GtkTreeSelection* selection,
     CookieTreeNode* node =
         static_cast<CookieTreeNode*>(adapter->GetNode(&iter));
     if (node->GetDetailedInfo().node_type !=
-        CookieTreeNode::DetailedInfo::TYPE_ORIGIN)
+        CookieTreeNode::DetailedInfo::TYPE_HOST)
       continue;
-    CookieTreeOriginNode* origin_node = static_cast<CookieTreeOriginNode*>(
+    CookieTreeHostNode* host_node = static_cast<CookieTreeHostNode*>(
         node);
-    if (origin_node->CanCreateContentException()) {
+    if (host_node->CanCreateContentException()) {
       if (!last_domain_name.empty())
         multiple_domains_added = true;
-      last_domain_name = origin_node->GetTitle();
+      last_domain_name = host_node->GetTitle();
       Profile* profile = tab_contents_->profile();
-      origin_node->CreateContentException(
+      host_node->CreateContentException(
           CookieSettings::Factory::GetForProfile(profile), setting);
     }
   }