Index: content/browser/renderer_host/render_view_host.cc |
=================================================================== |
--- content/browser/renderer_host/render_view_host.cc (revision 110303) |
+++ content/browser/renderer_host/render_view_host.cc (working copy) |
@@ -23,7 +23,7 @@ |
#include "content/browser/host_zoom_map.h" |
#include "content/browser/in_process_webkit/session_storage_namespace.h" |
#include "content/browser/power_save_blocker.h" |
-#include "content/browser/renderer_host/render_process_host.h" |
+#include "content/browser/renderer_host/render_process_host_impl.h" |
#include "content/browser/renderer_host/render_view_host_delegate.h" |
#include "content/browser/renderer_host/render_view_host_observer.h" |
#include "content/browser/renderer_host/render_widget_host.h" |
@@ -122,7 +122,7 @@ |
render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING) { |
if (!session_storage_namespace_) { |
session_storage_namespace_ = new SessionStorageNamespace( |
- process()->browser_context()->GetWebKitContext()); |
+ process()->GetBrowserContext()->GetWebKitContext()); |
} |
DCHECK(instance_); |
@@ -153,7 +153,7 @@ |
// Be sure to clean up any leftover state from cross-site requests. |
CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( |
- process()->id(), routing_id(), false); |
+ process()->GetID(), routing_id(), false); |
} |
bool RenderViewHost::CreateRenderView(const string16& frame_name) { |
@@ -166,7 +166,7 @@ |
if (!process()->Init(renderer_accessible())) |
return false; |
DCHECK(process()->HasConnection()); |
- DCHECK(process()->browser_context()); |
+ DCHECK(process()->GetBrowserContext()); |
renderer_initialized_ = true; |
@@ -176,7 +176,7 @@ |
ViewMsg_New_Params params; |
params.parent_window = GetNativeViewId(); |
params.renderer_preferences = |
- delegate_->GetRendererPrefs(process()->browser_context()); |
+ delegate_->GetRendererPrefs(process()->GetBrowserContext()); |
params.web_preferences = delegate_->GetWebkitPrefs(); |
params.view_id = routing_id(); |
params.session_storage_namespace_id = session_storage_namespace_->id(); |
@@ -202,12 +202,12 @@ |
void RenderViewHost::SyncRendererPrefs() { |
Send(new ViewMsg_SetRendererPrefs(routing_id(), |
delegate_->GetRendererPrefs( |
- process()->browser_context()))); |
+ process()->GetBrowserContext()))); |
} |
void RenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) { |
ChildProcessSecurityPolicy::GetInstance()->GrantRequestURL( |
- process()->id(), params.url); |
+ process()->GetID(), params.url); |
ViewMsg_Navigate* nav_message = new ViewMsg_Navigate(routing_id(), params); |
@@ -330,7 +330,7 @@ |
StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kUnloadTimeoutMS)); |
ViewMsg_SwapOut_Params params; |
- params.closing_process_id = process()->id(); |
+ params.closing_process_id = process()->GetID(); |
params.closing_route_id = routing_id(); |
params.new_render_process_host_id = new_render_process_host_id; |
params.new_request_id = new_request_id; |
@@ -392,7 +392,7 @@ |
void RenderViewHost::SetHasPendingCrossSiteRequest(bool has_pending_request, |
int request_id) { |
CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( |
- process()->id(), routing_id(), has_pending_request); |
+ process()->GetID(), routing_id(), has_pending_request); |
pending_request_id_ = request_id; |
} |
@@ -408,17 +408,17 @@ |
// Grant the renderer the ability to load the drop_data. |
ChildProcessSecurityPolicy* policy = |
ChildProcessSecurityPolicy::GetInstance(); |
- policy->GrantRequestURL(process()->id(), drop_data.url); |
+ policy->GrantRequestURL(process()->GetID(), drop_data.url); |
for (std::vector<string16>::const_iterator iter(drop_data.filenames.begin()); |
iter != drop_data.filenames.end(); ++iter) { |
FilePath path = FilePath::FromWStringHack(UTF16ToWideHack(*iter)); |
- policy->GrantRequestURL(process()->id(), |
+ policy->GrantRequestURL(process()->GetID(), |
net::FilePathToFileURL(path)); |
- policy->GrantReadFile(process()->id(), path); |
+ policy->GrantReadFile(process()->GetID(), path); |
// Allow dragged directories to be enumerated by the child process. |
// Note that we can't tell a file from a directory at this point. |
- policy->GrantReadDirectory(process()->id(), path); |
+ policy->GrantReadDirectory(process()->GetID(), path); |
} |
Send(new DragMsg_TargetDragEnter(routing_id(), drop_data, client_pt, |
screen_pt, operations_allowed)); |
@@ -521,7 +521,7 @@ |
void RenderViewHost::JavaScriptDialogClosed(IPC::Message* reply_msg, |
bool success, |
const string16& user_input) { |
- process()->set_ignore_input_events(false); |
+ process()->SetIgnoreInputEvents(false); |
bool is_waiting = |
is_waiting_for_beforeunload_ack_ || is_waiting_for_unload_ack_; |
if (is_waiting) |
@@ -567,7 +567,7 @@ |
void RenderViewHost::AllowBindings(int bindings_flags) { |
if (bindings_flags & content::BINDINGS_POLICY_WEB_UI) { |
ChildProcessSecurityPolicy::GetInstance()->GrantWebUIBindings( |
- process()->id()); |
+ process()->GetID()); |
} |
enabled_bindings_ |= bindings_flags; |
@@ -610,7 +610,7 @@ |
for (std::vector<FilePath>::const_iterator file = files.begin(); |
file != files.end(); ++file) { |
ChildProcessSecurityPolicy::GetInstance()->GrantPermissionsForFile( |
- process()->id(), *file, permissions); |
+ process()->GetID(), *file, permissions); |
} |
Send(new ViewMsg_RunFileChooserResponse(routing_id(), files)); |
} |
@@ -622,7 +622,7 @@ |
for (std::vector<FilePath>::const_iterator file = files.begin(); |
file != files.end(); ++file) { |
ChildProcessSecurityPolicy::GetInstance()->GrantReadFile( |
- process()->id(), *file); |
+ process()->GetID(), *file); |
} |
Send(new ViewMsg_EnumerateDirectoryResponse(routing_id(), |
request_id, |
@@ -637,7 +637,7 @@ |
} |
bool RenderViewHost::SuddenTerminationAllowed() const { |
- return sudden_termination_allowed_ || process()->sudden_termination_allowed(); |
+ return sudden_termination_allowed_ || process()->SuddenTerminationAllowed(); |
} |
/////////////////////////////////////////////////////////////////////////////// |
@@ -883,7 +883,7 @@ |
if (is_waiting_for_unload_ack_) |
return; |
- const int renderer_id = process()->id(); |
+ const int renderer_id = process()->GetID(); |
ChildProcessSecurityPolicy* policy = |
ChildProcessSecurityPolicy::GetInstance(); |
// Without this check, an evil renderer can trick the browser into creating |
@@ -985,7 +985,7 @@ |
// Validate the URLs in |params|. If the renderer can't request the URLs |
// directly, don't show them in the context menu. |
ContextMenuParams validated_params(params); |
- int renderer_id = process()->id(); |
+ int renderer_id = process()->GetID(); |
ChildProcessSecurityPolicy* policy = |
ChildProcessSecurityPolicy::GetInstance(); |
@@ -1010,7 +1010,7 @@ |
int64 source_frame_id) { |
GURL validated_url(url); |
FilterURL(ChildProcessSecurityPolicy::GetInstance(), |
- process()->id(), &validated_url); |
+ process()->GetID(), &validated_url); |
delegate_->RequestOpenURL( |
validated_url, referrer, disposition, source_frame_id); |
@@ -1058,7 +1058,7 @@ |
IPC::Message* reply_msg) { |
// While a JS message dialog is showing, tabs in the same process shouldn't |
// process input events. |
- process()->set_ignore_input_events(true); |
+ process()->SetIgnoreInputEvents(true); |
StopHangMonitorTimeout(); |
delegate_->RunJavaScriptMessage(this, message, default_prompt, frame_url, |
flags, reply_msg, |
@@ -1070,7 +1070,7 @@ |
IPC::Message* reply_msg) { |
// While a JS before unload dialog is showing, tabs in the same process |
// shouldn't process input events. |
- process()->set_ignore_input_events(true); |
+ process()->SetIgnoreInputEvents(true); |
StopHangMonitorTimeout(); |
delegate_->RunBeforeUnloadConfirm(this, message, reply_msg); |
} |
@@ -1092,8 +1092,8 @@ |
// Allow drag of Javascript URLs to enable bookmarklet drag to bookmark bar. |
if (!drag_url.SchemeIs(chrome::kJavaScriptScheme)) |
- FilterURL(policy, process()->id(), &drag_url); |
- FilterURL(policy, process()->id(), &html_base_url); |
+ FilterURL(policy, process()->GetID(), &drag_url); |
+ FilterURL(policy, process()->GetID(), &html_base_url); |
if (drag_url != drop_data.url || html_base_url != drop_data.html_base_url) { |
WebDropData drop_data_copy = drop_data; |
@@ -1410,14 +1410,15 @@ |
bool remember, |
const GURL& url) { |
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
- HostZoomMap* host_zoom_map = process()->browser_context()->GetHostZoomMap(); |
+ HostZoomMap* host_zoom_map = process()->GetBrowserContext()-> |
+ GetHostZoomMap(); |
if (remember) { |
host_zoom_map->SetZoomLevel(net::GetHostOrSpecFromURL(url), zoom_level); |
// Notify renderers from this browser context. |
for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator()); |
!i.IsAtEnd(); i.Advance()) { |
RenderProcessHost* render_process_host = i.GetCurrentValue(); |
- if (render_process_host->browser_context()->GetHostZoomMap()-> |
+ if (render_process_host->GetBrowserContext()->GetHostZoomMap()-> |
GetOriginal() == host_zoom_map) { |
render_process_host->Send( |
new ViewMsg_SetZoomLevelForCurrentURL(url, zoom_level)); |
@@ -1425,7 +1426,7 @@ |
} |
} else { |
host_zoom_map->SetTemporaryZoomLevel( |
- process()->id(), routing_id(), zoom_level); |
+ process()->GetID(), routing_id(), zoom_level); |
} |
} |
@@ -1454,7 +1455,7 @@ |
void RenderViewHost::OnRequestDesktopNotificationPermission( |
const GURL& source_origin, int callback_context) { |
content::GetContentClient()->browser()->RequestDesktopNotificationPermission( |
- source_origin, callback_context, process()->id(), routing_id()); |
+ source_origin, callback_context, process()->GetID(), routing_id()); |
} |
void RenderViewHost::OnShowDesktopNotification( |
@@ -1469,12 +1470,12 @@ |
} |
content::GetContentClient()->browser()->ShowDesktopNotification( |
- params, process()->id(), routing_id(), false); |
+ params, process()->GetID(), routing_id(), false); |
} |
void RenderViewHost::OnCancelDesktopNotification(int notification_id) { |
content::GetContentClient()->browser()->CancelDesktopNotification( |
- process()->id(), routing_id(), notification_id); |
+ process()->GetID(), routing_id(), notification_id); |
} |
#if defined(OS_MACOSX) |