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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 9221017: Hide BrowsingInstance from all but SiteInstance, as intended by design. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 8 years, 11 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
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/debugger/devtools_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 102d6e749f810eccf0177775814b609f94e02850..4ebe7390bed59d2ab085aeeb93c1dc38addffe0c 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -66,7 +66,6 @@
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "content/browser/browser_url_handler.h"
-#include "content/browser/browsing_instance.h"
#include "content/browser/child_process_security_policy.h"
#include "content/browser/gpu/gpu_data_manager.h"
#include "content/browser/gpu/gpu_process_host.h"
@@ -326,7 +325,7 @@ void ChromeContentBrowserClient::RenderViewHostCreated(
SiteInstance* site_instance = render_view_host->site_instance();
Profile* profile = Profile::FromBrowserContext(
- site_instance->browsing_instance()->browser_context());
+ site_instance->GetBrowserContext());
new ChromeRenderViewHostObserver(render_view_host,
profile->GetNetworkPredictor());
@@ -488,7 +487,7 @@ void ChromeContentBrowserClient::SiteInstanceGotProcess(
CHECK(site_instance->HasProcess());
Profile* profile = Profile::FromBrowserContext(
- site_instance->browsing_instance()->browser_context());
+ site_instance->GetBrowserContext());
ExtensionService* service = profile->GetExtensionService();
if (!service)
return;
@@ -517,7 +516,7 @@ void ChromeContentBrowserClient::SiteInstanceDeleting(
return;
Profile* profile = Profile::FromBrowserContext(
- site_instance->browsing_instance()->browser_context());
+ site_instance->GetBrowserContext());
ExtensionService* service = profile->GetExtensionService();
if (!service)
return;
« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/debugger/devtools_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698