Refactoring CookiesTreeModel to support multiple data sources.

chrome/browser/ui/webui/options2/cookies_view_handler2.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/webui/options2/cookies_view_handler2.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_set.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"
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data_server_bound_cert_helper.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace options2 {
 
 CookiesViewHandler::CookiesViewHandler() : batch_update_(false) {
 }
@@ skipping 126 matching lines @@
 void CookiesViewHandler::TreeModelEndBatch(CookiesTreeModel* model) {
   DCHECK(batch_update_);
   batch_update_ = false;
 
   SendChildren(cookies_tree_model_->GetRoot());
 }
 
 void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
   if (!cookies_tree_model_.get()) {
     Profile* profile = Profile::FromWebUI(web_ui());
-    cookies_tree_model_.reset(new CookiesTreeModel(
+    string16 name = ASCIIToUTF16("Site Data");
+    string16 browser_id;

[Evan Stade, 2012/06/20 21:06:30]

this is still here

[nasko, 2012/06/20 22:32:32]

Done.

+    ContainerMap apps_map;
+
+    apps_map[browser_id] = new LocalDataContainer(
+        name, browser_id,
         new BrowsingDataCookieHelper(profile->GetRequestContext()),
         new BrowsingDataDatabaseHelper(profile),
         new BrowsingDataLocalStorageHelper(profile),
         NULL,
         new BrowsingDataAppCacheHelper(profile),
         BrowsingDataIndexedDBHelper::Create(profile),
         BrowsingDataFileSystemHelper::Create(profile),
         BrowsingDataQuotaHelper::Create(profile),
-        BrowsingDataServerBoundCertHelper::Create(profile),
-        false));
+        BrowsingDataServerBoundCertHelper::Create(profile));
+
+    const ExtensionService* service = profile->GetExtensionService();
+    if (service) {
+      string16 app_id;

[Evan Stade, 2012/06/20 21:06:30]

why is this declared here

[nasko, 2012/06/20 22:32:32]

The reason is that in the loop over all extensions, we will actually have valid
id that is non-empty. It is a variable to hold that id and pass it to the
LocalDataContainer constructor. It will disappear as I migrate the app_id and
app_name to std::strings.

+      const ExtensionSet* extensions = service->extensions();
+      for (ExtensionSet::const_iterator it = extensions->begin();
+           it != extensions->end(); ++it) {
+        if ((*it)->is_storage_isolated()) {
+          net::URLRequestContextGetter* context_getter =
+              profile->GetRequestContextForIsolatedApp((*it)->id());
+          name = ASCIIToUTF16((*it)->name());
+          app_id = ASCIIToUTF16((*it)->id());
+          apps_map[app_id] = new LocalDataContainer(
+              name, app_id,
+              new BrowsingDataCookieHelper(context_getter),
+              new BrowsingDataDatabaseHelper(profile),
+              new BrowsingDataLocalStorageHelper(profile),
+              NULL,
+              new BrowsingDataAppCacheHelper(profile),
+              BrowsingDataIndexedDBHelper::Create(profile),
+              BrowsingDataFileSystemHelper::Create(profile),
+              BrowsingDataQuotaHelper::Create(profile),
+              BrowsingDataServerBoundCertHelper::Create(profile));
+        }
+      }
+    }
+    cookies_tree_model_.reset(new CookiesTreeModel(apps_map, false));
     cookies_tree_model_->AddCookiesTreeObserver(this);
   }
 }
 
 void CookiesViewHandler::UpdateSearchResults(const ListValue* args) {
-  std::string query;
+  string16 query;
   if (!args->GetString(0, &query)) {
     return;
   }
 
   EnsureCookiesTreeModelCreated();
 
-  cookies_tree_model_->UpdateSearchResults(UTF8ToWide(query));
+  cookies_tree_model_->UpdateSearchResults(query);
 }
 
 void CookiesViewHandler::RemoveAll(const ListValue* args) {
   EnsureCookiesTreeModelCreated();
-  cookies_tree_model_->DeleteAllStoredObjects();
+  // TODO(nasko): This will only remove the browser stored data, not the
+  // isolated apps data. This is fine for now, but should be changed based
+  // on the new isolated storage UI.
+  cookies_tree_model_->DeleteStoredObjectsForApp(string16());
 }
 
 void CookiesViewHandler::Remove(const ListValue* args) {
   std::string node_path;
   if (!args->GetString(0, &node_path)) {
     return;
   }
 
   EnsureCookiesTreeModelCreated();
 
@@ skipping 25 matching lines @@
   ListValue args;
   args.Append(parent == cookies_tree_model_->GetRoot() ?
       Value::CreateNullValue() :
       Value::CreateStringValue(cookies_tree_model_util::GetTreeNodeId(parent)));
   args.Append(children);
 
   web_ui()->CallJavascriptFunction("CookiesView.loadChildren", args);
 }
 
 }  // namespace options2