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

Unified Diff: chrome/browser/renderer_host/chrome_render_view_host_observer.cc

Issue 9146028: Define the public interface for content browser SiteInstance. This interface is implemented by th... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' 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
Index: chrome/browser/renderer_host/chrome_render_view_host_observer.cc
===================================================================
--- chrome/browser/renderer_host/chrome_render_view_host_observer.cc (revision 118703)
+++ chrome/browser/renderer_host/chrome_render_view_host_observer.cc (working copy)
@@ -16,15 +16,15 @@
#include "chrome/common/url_constants.h"
#include "content/browser/child_process_security_policy.h"
#include "content/browser/renderer_host/render_view_host.h"
-#include "content/browser/site_instance.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_view_host_delegate.h"
+#include "content/public/browser/site_instance.h"
ChromeRenderViewHostObserver::ChromeRenderViewHostObserver(
RenderViewHost* render_view_host, chrome_browser_net::Predictor* predictor)
: content::RenderViewHostObserver(render_view_host),
predictor_(predictor) {
- SiteInstance* site_instance = render_view_host->site_instance();
+ content::SiteInstance* site_instance = render_view_host->site_instance();
profile_ = Profile::FromBrowserContext(
site_instance->GetBrowserContext());
@@ -132,8 +132,8 @@
// Note that due to ChromeContentBrowserClient::GetEffectiveURL(), hosted apps
// (excluding bookmark apps) will have a chrome-extension:// URL for their
// site, so we can ignore that wrinkle here.
- SiteInstance* site_instance = render_view_host()->site_instance();
- const GURL& site = site_instance->site();
+ content::SiteInstance* site_instance = render_view_host()->site_instance();
+ const GURL& site = site_instance->GetSite();
if (!site.SchemeIs(chrome::kExtensionScheme))
return NULL;

Powered by Google App Engine
This is Rietveld 408576698