chrome/browser/ui/webui/options/cookies_view_handler.cc - Issue 11147026: Initial refactor to get profiles to propagate storage partition details.

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

Issue 11147026: Initial refactor to get profiles to propagate storage partition details. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Changing bool param to pass by reference. Created 8 years, 2 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

« chrome/browser/storage_partition_details.h ('K') | « chrome/browser/storage_partition_details.h ('k') | chrome/test/base/testing_profile.h » ('j') | content/browser/storage_partition_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 065c3dc51829c12fd65897090aaeb2c235a88b74..5e33680dd107a5955c454bd41b9c553e3c94ec4b 100644

--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc

+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc

@@ -25,6 +25,8 @@

#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/render_process_host.h"

+#include "content/public/browser/site_instance.h"

#include "content/public/browser/storage_partition.h"

#include "content/public/browser/web_ui.h"

#include "grit/generated_resources.h"

@@ -223,13 +225,21 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {

Profile* profile = Profile::FromWebUI(web_ui());

ContainerMap apps_map;

const ExtensionService* service = profile->GetExtensionService();

- if (service) {

+ ExtensionProcessManager* process_manager =

+ profile->GetExtensionProcessManager();

+ if (service && process_manager) {

const ExtensionSet* extensions = service->extensions();

for (ExtensionSet::const_iterator it = extensions->begin();

it != extensions->end(); ++it) {

if ((*it)->is_storage_isolated()) {

+ content::SiteInstance* site = process_manager->GetSiteInstanceForURL(

+ (*it)->url());

+ content::StoragePartition* storage_partition =

+ site->GetProcess()->GetStoragePartition();

net::URLRequestContextGetter* context_getter =

- profile->GetRequestContextForStoragePartition((*it)->id());

+ profile->GetRequestContextForStoragePartition(

awong 2012/10/18 22:36:15 I think all these cases where we call GetRCForStor

nasko 2012/10/19 17:29:14 Done.

+ storage_partition->GetPath(),

+ storage_partition->IsInMemoryOnly());

// TODO(nasko): When new types of storage are isolated, add the

// appropriate browsing data helper objects to the constructor.

// For now, just cookies are isolated, so other parameters are NULL.