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

Unified Diff: chrome/browser/ui/webui/options/cookies_view_handler.cc

Issue 10836216: Add SiteInstance parameters to IndexedDBContext calls (Closed) Base URL: http://git.chromium.org/chromium/src.git@isolated-storage
Patch Set: Candidate patch Created 8 years, 3 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
Index: chrome/browser/ui/webui/options/cookies_view_handler.cc
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 8bf447d091e184e1144a1c604b47001f1ae3e6de..e8e12f7c0323cdf09f74838f3e69284d57ec9af1 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -24,6 +24,9 @@
#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/browser_context.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
@@ -188,6 +191,12 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
if (!app_context_ && !cookies_tree_model_.get()) {
Profile* profile = Profile::FromWebUI(web_ui());
ContainerMap apps_map;
+ content::WebContents* contents = web_ui()->GetWebContents();
awong 2012/09/10 21:55:21 This isn't quite right. The StoragePartition for
+ content::StoragePartition* storage_partition =
+ content::BrowserContext::GetStoragePartition(
+ profile, contents->GetSiteInstance());
+ content::IndexedDBContext* indexed_db_context =
+ storage_partition->GetIndexedDBContext();
apps_map[std::string()] = new LocalDataContainer(
"Site Data", std::string(),
new BrowsingDataCookieHelper(profile->GetRequestContext()),
@@ -195,7 +204,7 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
new BrowsingDataLocalStorageHelper(profile),
NULL,
new BrowsingDataAppCacheHelper(profile),
- BrowsingDataIndexedDBHelper::Create(profile),
+ BrowsingDataIndexedDBHelper::Create(indexed_db_context),
BrowsingDataFileSystemHelper::Create(profile),
BrowsingDataQuotaHelper::Create(profile),
BrowsingDataServerBoundCertHelper::Create(profile),

Powered by Google App Engine
This is Rietveld 408576698