Refactoring CookiesTreeModel to support multiple data sources.

chrome/browser/ui/views/collected_cookies_views.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/views/collected_cookies_views.h"
 
 #include "chrome/browser/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_file_system_helper.h"
@@ skipping 314 matching lines @@
 views::View* CollectedCookiesViews::CreateAllowedPane() {
   TabSpecificContentSettings* content_settings =
       tab_contents_->content_settings();
 
   // Create the controls that go into the pane.
   allowed_label_ = new views::Label(l10n_util::GetStringUTF16(
       IDS_COLLECTED_COOKIES_ALLOWED_COOKIES_LABEL));
 
   const LocalSharedObjectsContainer& allowed_lsos =
       content_settings->allowed_local_shared_objects();
-  allowed_cookies_tree_model_.reset(
-      new CookiesTreeModel(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(),
-                           true));
+
+  string16 name = ASCIIToUTF16("Site Data");
+  string16 browser_id;
+  ContainerMap apps_map;
+  apps_map[browser_id] = new LocalDataContainer(
+      name, browser_id,
+      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, true));
   allowed_cookies_tree_ = new views::TreeView();
   allowed_cookies_tree_->SetModel(allowed_cookies_tree_model_.get());
   allowed_cookies_tree_->SetRootShown(false);
   allowed_cookies_tree_->SetEditable(false);
   allowed_cookies_tree_->set_lines_at_root(true);
   allowed_cookies_tree_->set_auto_expand_children(true);
   allowed_cookies_tree_->SetController(this);
 
   block_allowed_button_ = new views::NativeTextButton(this,
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_BLOCK_BUTTON));
@@ skipping 37 matching lines @@
   // Create the controls that go into the pane.
   blocked_label_ = new views::Label(
       l10n_util::GetStringUTF16(
           prefs->GetBoolean(prefs::kBlockThirdPartyCookies) ?
               IDS_COLLECTED_COOKIES_BLOCKED_THIRD_PARTY_BLOCKING_ENABLED :
               IDS_COLLECTED_COOKIES_BLOCKED_COOKIES_LABEL));
   blocked_label_->SetMultiLine(true);
   blocked_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
   const LocalSharedObjectsContainer& blocked_lsos =
       content_settings->blocked_local_shared_objects();
-  blocked_cookies_tree_model_.reset(
-      new CookiesTreeModel(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(),
-                           true));
+
+  string16 name = ASCIIToUTF16("Site Data");
+  string16 browser_id;
+  ContainerMap apps_map;
+  apps_map[browser_id] = new LocalDataContainer(
+      name, browser_id,
+      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, true));
   blocked_cookies_tree_ = new views::TreeView();
   blocked_cookies_tree_->SetModel(blocked_cookies_tree_model_.get());
   blocked_cookies_tree_->SetRootShown(false);
   blocked_cookies_tree_->SetEditable(false);
   blocked_cookies_tree_->set_lines_at_root(true);
   blocked_cookies_tree_->set_auto_expand_children(true);
   blocked_cookies_tree_->SetController(this);
 
   allow_blocked_button_ = new views::NativeTextButton(this,
       l10n_util::GetStringUTF16(IDS_COLLECTED_COOKIES_ALLOW_BUTTON));
@@ skipping 100 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // CollectedCookiesViews, content::NotificationObserver implementation:
 
 void CollectedCookiesViews::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN);
   window_->CloseConstrainedWindow();
 }