| Index: chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
|
| diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
|
| index 714de23297a6910d245057d0a76cabc34be959f5..4614d753f749f9ef713d0e8bc111bf3b647bd190 100644
|
| --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
|
| +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
|
| @@ -59,6 +59,7 @@ int GetFrameId(bool is_main_frame, int64 frame_id) {
|
|
|
| // Constructs and dispatches an onBeforeNavigate event.
|
| void DispatchOnBeforeNavigate(content::WebContents* web_contents,
|
| + int render_process_id,
|
| int64 frame_id,
|
| bool is_main_frame,
|
| const GURL& validated_url) {
|
| @@ -66,8 +67,7 @@ void DispatchOnBeforeNavigate(content::WebContents* web_contents,
|
| DictionaryValue* dict = new DictionaryValue();
|
| dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
|
| dict->SetString(keys::kUrlKey, validated_url.spec());
|
| - dict->SetInteger(keys::kProcessIdKey,
|
| - web_contents->GetRenderViewHost()->GetProcess()->GetID());
|
| + dict->SetInteger(keys::kProcessIdKey, render_process_id);
|
| dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id));
|
| dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
|
| args.Append(dict);
|
| @@ -189,6 +189,7 @@ void DispatchOnCreatedNavigationTarget(
|
|
|
| // Constructs and dispatches an onErrorOccurred event.
|
| void DispatchOnErrorOccurred(content::WebContents* web_contents,
|
| + int render_process_id,
|
| const GURL& url,
|
| int64 frame_id,
|
| bool is_main_frame,
|
| @@ -197,8 +198,7 @@ void DispatchOnErrorOccurred(content::WebContents* web_contents,
|
| DictionaryValue* dict = new DictionaryValue();
|
| dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
|
| dict->SetString(keys::kUrlKey, url.spec());
|
| - dict->SetInteger(keys::kProcessIdKey,
|
| - web_contents->GetRenderViewHost()->GetProcess()->GetID());
|
| + dict->SetInteger(keys::kProcessIdKey, render_process_id);
|
| dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id));
|
| dict->SetString(keys::kErrorKey, net::ErrorToString(error_code));
|
| dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
|
|
|