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

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

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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/extension_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc
index 128afb97a7fdb8c6589fba7d19fd4aaedbe6da05..b8331206a0b212e61034cd96314e6676e0333d1c 100644
--- a/chrome/browser/ui/webui/options/extension_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc
@@ -603,7 +603,7 @@ void ExtensionSettingsHandler::Observe(
// Fall through.
case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED:
source_profile = Profile::FromBrowserContext(
- content::Source<RenderViewHost>(source)->site_instance()->
+ content::Source<RenderViewHost>(source)->GetSiteInstance()->
GetBrowserContext());
if (!profile->IsSameProfile(source_profile))
return;
@@ -767,16 +767,16 @@ void ExtensionSettingsHandler::GetActivePagesForExtensionProcess(
for (std::set<RenderViewHost*>::const_iterator iter = views.begin();
iter != views.end(); ++iter) {
RenderViewHost* host = *iter;
- int host_type = host->delegate()->GetRenderViewType();
+ int host_type = host->GetDelegate()->GetRenderViewType();
if (host == deleting_rvh_ ||
chrome::VIEW_TYPE_EXTENSION_POPUP == host_type ||
chrome::VIEW_TYPE_EXTENSION_DIALOG == host_type)
continue;
- GURL url = host->delegate()->GetURL();
- content::RenderProcessHost* process = host->process();
+ GURL url = host->GetDelegate()->GetURL();
+ content::RenderProcessHost* process = host->GetProcess();
result->push_back(
- ExtensionPage(url, process->GetID(), host->routing_id(),
+ ExtensionPage(url, process->GetID(), host->GetRoutingID(),
process->GetBrowserContext()->IsOffTheRecord()));
}
}

Powered by Google App Engine
This is Rietveld 408576698