Define the public interface for content browser SiteInstance. This interface is implemented by th...

chrome/browser/renderer_host/chrome_render_view_host_observer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/net/predictor.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
 #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());
 
   InitRenderViewHostForExtensions();
 }
 
 ChromeRenderViewHostObserver::~ChromeRenderViewHostObserver() {
   RemoveRenderViewHostForExtensions(render_view_host());
 }
 
@@ skipping 87 matching lines @@
       (type == Extension::TYPE_HOSTED_APP &&
        extension->location() == Extension::COMPONENT)) {
     Send(new ExtensionMsg_ActivateExtension(extension->id()));
   }
 }
 
 const Extension* ChromeRenderViewHostObserver::GetExtension() {
   // 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;
 
   ExtensionService* service = profile_->GetExtensionService();
   if (!service)
     return NULL;
 
   // Reload the extension if it has crashed.
   // TODO(yoz): This reload doesn't happen synchronously for unpacked
@@ skipping 23 matching lines @@
       content::Source<RenderViewHost>(render_view_host()),
       content::Details<DomOperationNotificationDetails>(&details));
 }
 
 void ChromeRenderViewHostObserver::OnFocusedEditableNodeTouched() {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_FOCUSED_EDITABLE_NODE_TOUCHED,
       content::Source<RenderViewHost>(render_view_host()),
       content::NotificationService::NoDetails());
 }