Show Flash LSOs for Pepper Flash in cookie dialog.

chrome/browser/ui/gtk/collected_cookies_gtk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
 
 #include <string>
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
@@ skipping 195 matching lines @@
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
   TabSpecificContentSettings* content_settings =
       tab_contents_->content_settings();
 
-  const LocalSharedObjectsContainer& allowed_lsos =
+  const LocalSharedObjectsContainer& allowed =

[markusheintz_, 2012/07/30 14:02:15]

Although 'allowed_lsos' is already a bad name this change does not really
improve the name :(.

Maybe something like 'allowed_site_data' or just 'allowed_data' would be better.

same in all other places where you s/allowed_lsos/allowed/
same for blocked_...

[Bernhard Bauer, 2012/07/31 00:20:03]

Done.

       content_settings->allowed_local_shared_objects();
-  ContainerMap apps_map;
-  apps_map[std::string()] = new LocalDataContainer(
-      std::string(), std::string(),
-      allowed_lsos.cookies()->Clone(),
-      allowed_lsos.databases()->Clone(),
-      allowed_lsos.local_storages()->Clone(),
-      allowed_lsos.session_storages()->Clone(),
-      allowed_lsos.appcaches()->Clone(),
-      allowed_lsos.indexed_dbs()->Clone(),
-      allowed_lsos.file_systems()->Clone(),
-      NULL,
-      allowed_lsos.server_bound_certs()->Clone());
-  allowed_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true));
+  allowed_cookies_tree_model_ = allowed.CreateCookiesTreeModel();
+
   allowed_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, allowed_cookies_tree_model_.get()));
   allowed_tree_ = gtk_tree_view_new_with_model(
       GTK_TREE_MODEL(allowed_cookies_tree_adapter_->tree_store()));
   gtk_widget_set_size_request(allowed_tree_, kTreeViewWidth, kTreeViewHeight);
   gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(allowed_tree_), FALSE);
   gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(allowed_tree_), TRUE);
   gtk_container_add(GTK_CONTAINER(scroll_window), allowed_tree_);
 
   GtkTreeViewColumn* title_column = gtk_tree_view_column_new();
@@ skipping 56 matching lines @@
   gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll_window),
                                       GTK_SHADOW_ETCHED_IN);
   gtk_box_pack_start(GTK_BOX(cookie_list_vbox), scroll_window, TRUE, TRUE, 0);
 
   TabSpecificContentSettings* content_settings =
       tab_contents_->content_settings();
 
-  const LocalSharedObjectsContainer& blocked_lsos =
+  const LocalSharedObjectsContainer& blocked =
       content_settings->blocked_local_shared_objects();
-  ContainerMap apps_map;
-  apps_map[std::string()] = new LocalDataContainer(
-      std::string(), std::string(),
-      blocked_lsos.cookies()->Clone(),
-      blocked_lsos.databases()->Clone(),
-      blocked_lsos.local_storages()->Clone(),
-      blocked_lsos.session_storages()->Clone(),
-      blocked_lsos.appcaches()->Clone(),
-      blocked_lsos.indexed_dbs()->Clone(),
-      blocked_lsos.file_systems()->Clone(),
-      NULL,
-      blocked_lsos.server_bound_certs()->Clone());
-  blocked_cookies_tree_model_.reset(new CookiesTreeModel(apps_map, NULL, true));
+  blocked_cookies_tree_model_ = blocked.CreateCookiesTreeModel();
+
   blocked_cookies_tree_adapter_.reset(
       new gtk_tree::TreeAdapter(this, blocked_cookies_tree_model_.get()));
   blocked_tree_ = gtk_tree_view_new_with_model(
       GTK_TREE_MODEL(blocked_cookies_tree_adapter_->tree_store()));
   gtk_widget_set_size_request(blocked_tree_, kTreeViewWidth, kTreeViewHeight);
   gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(blocked_tree_), FALSE);
   gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(blocked_tree_), TRUE);
   gtk_container_add(GTK_CONTAINER(scroll_window), blocked_tree_);
 
   GtkTreeViewColumn* title_column = gtk_tree_view_column_new();
@@ skipping 227 matching lines @@
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
   gtk_tree_view_expand_row(GTK_TREE_VIEW(tree_view), path, TRUE);
   g_signal_handlers_unblock_by_func(
       tree_view, reinterpret_cast<gpointer>(OnTreeViewRowExpandedThunk), this);
 }
 
 void CollectedCookiesGtk::OnTreeViewSelectionChange(GtkWidget* selection) {
   EnableControls();
   ShowCookieInfo(gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook_)));
 }