Index: content/browser/renderer_host/render_view_host.cc |
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc |
index 2376d887da51e22987dc3f71df514e1fe0a1a0a8..94081c882f63e19d7583a6bcd1b9b6aab76f5a87 100644 |
--- a/content/browser/renderer_host/render_view_host.cc |
+++ b/content/browser/renderer_host/render_view_host.cc |
@@ -15,7 +15,7 @@ |
#include "base/time.h" |
#include "base/utf_string_conversions.h" |
#include "base/values.h" |
-#include "chrome/browser/profiles/profile.h" |
+#include "content/browser/browser_context.h" |
#include "content/browser/browser_message_filter.h" |
#include "content/browser/child_process_security_policy.h" |
#include "content/browser/content_browser_client.h" |
@@ -105,7 +105,7 @@ RenderViewHost::RenderViewHost(SiteInstance* instance, |
render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { |
if (!session_storage_namespace_) { |
session_storage_namespace_ = |
- new SessionStorageNamespace(process()->profile()->GetWebKitContext()); |
+ new SessionStorageNamespace(process()->context()->GetWebKitContext()); |
} |
DCHECK(instance_); |
@@ -147,7 +147,7 @@ bool RenderViewHost::CreateRenderView(const string16& frame_name) { |
if (!process()->Init(renderer_accessible())) |
return false; |
DCHECK(process()->HasConnection()); |
- DCHECK(process()->profile()); |
+ DCHECK(process()->context()); |
if (BindingsPolicy::is_web_ui_enabled(enabled_bindings_)) { |
ChildProcessSecurityPolicy::GetInstance()->GrantWebUIBindings( |
@@ -167,7 +167,7 @@ bool RenderViewHost::CreateRenderView(const string16& frame_name) { |
ViewMsg_New_Params params; |
params.parent_window = GetNativeViewId(); |
params.renderer_preferences = |
- delegate_->GetRendererPrefs(process()->profile()); |
+ delegate_->GetRendererPrefs(process()->context()); |
params.web_preferences = delegate_->GetWebkitPrefs(); |
params.view_id = routing_id(); |
params.session_storage_namespace_id = session_storage_namespace_->id(); |
@@ -193,7 +193,7 @@ bool RenderViewHost::IsRenderViewLive() const { |
void RenderViewHost::SyncRendererPrefs() { |
Send(new ViewMsg_SetRendererPrefs(routing_id(), |
delegate_->GetRendererPrefs( |
- process()->profile()))); |
+ process()->context()))); |
} |
void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) { |
@@ -1260,14 +1260,14 @@ void RenderViewHost::OnDidZoomURL(double zoom_level, |
bool remember, |
const GURL& url) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- HostZoomMap* host_zoom_map = process()->profile()->GetHostZoomMap(); |
+ HostZoomMap* host_zoom_map = process()->context()->GetHostZoomMap(); |
if (remember) { |
host_zoom_map->SetZoomLevel(net::GetHostOrSpecFromURL(url), zoom_level); |
- // Notify renderers from this profile. |
+ // Notify renderers from this context. |
for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator()); |
!i.IsAtEnd(); i.Advance()) { |
RenderProcessHost* render_process_host = i.GetCurrentValue(); |
- if (render_process_host->profile() == process()->profile()) { |
+ if (render_process_host->context() == process()->context()) { |
render_process_host->Send( |
new ViewMsg_SetZoomLevelForCurrentURL(url, zoom_level)); |
} |