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

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: Fixed the order in the gypi file. 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
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..a622a17712c71d80370cc95672a2a3fd7aceef4a 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,18 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
Profile* profile = Profile::FromWebUI(web_ui());
ContainerMap apps_map;
const ExtensionService* service = profile->GetExtensionService();
- if (service) {
+ ExtensionProcessManager* process_manager =
+ profile->GetExtensionProcessManager();
awong 2012/10/29 23:37:40 2 more spaces
nasko 2012/10/30 00:32:59 Done.
+ 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::StoragePartition* storage_partition =
+ content::BrowserContext::GetStoragePartitionForSite(profile,
+ (*it)->url());
net::URLRequestContextGetter* context_getter =
- profile->GetRequestContextForStoragePartition((*it)->id());
+ storage_partition->GetURLRequestContext();
awong 2012/10/29 23:37:40 Why is this changing? Is it just cleanup, or is th
nasko 2012/10/30 00:32:59 Because GetRequestContextForStoragePartition is ch
// 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.

Powered by Google App Engine
This is Rietveld 408576698