From 8dd478ebc0cdb0d14a440f492c730cf14a01e323 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Thu, 21 Jul 2011 16:07:21 +0000 Subject: Drop requestId from webNavigation events BUG=none TEST=none Review URL: http://codereview.chromium.org/7389009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93408 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/extensions/extension_webnavigation_api.cc | 10 +++------- .../extensions/extension_webnavigation_api_constants.cc | 1 - .../browser/extensions/extension_webnavigation_api_constants.h | 1 - 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'chrome/browser') diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index bf395ab..28ee146 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -57,16 +57,13 @@ void DispatchEvent(Profile* profile, void DispatchOnBeforeNavigate(TabContents* tab_contents, int64 frame_id, bool is_main_frame, - const GURL& validated_url, - uint64 request_id) { + const GURL& validated_url) { ListValue args; DictionaryValue* dict = new DictionaryValue(); dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(tab_contents)); dict->SetString(keys::kUrlKey, validated_url.spec()); dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id)); - dict->SetString(keys::kRequestIdKey, - base::Uint64ToString(request_id)); dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now())); args.Append(dict); @@ -310,7 +307,7 @@ void ExtensionWebNavigationTabObserver::DidStartProvisionalLoadForFrame( if (!navigation_state_.CanSendEvents(frame_id)) return; DispatchOnBeforeNavigate( - tab_contents(), frame_id, is_main_frame, validated_url, 0); + tab_contents(), frame_id, is_main_frame, validated_url); } void ExtensionWebNavigationTabObserver::DidCommitProvisionalLoadForFrame( @@ -433,8 +430,7 @@ void ExtensionWebNavigationTabObserver::NavigatedReferenceFragment( DispatchOnBeforeNavigate(tab_contents(), frame_id, is_main_frame, - url, - 0); + url); DispatchOnCommitted(tab_contents(), frame_id, is_main_frame, diff --git a/chrome/browser/extensions/extension_webnavigation_api_constants.cc b/chrome/browser/extensions/extension_webnavigation_api_constants.cc index 88f68c1..39cec6e 100644 --- a/chrome/browser/extensions/extension_webnavigation_api_constants.cc +++ b/chrome/browser/extensions/extension_webnavigation_api_constants.cc @@ -8,7 +8,6 @@ namespace extension_webnavigation_api_constants { const char kErrorKey[] = "error"; const char kFrameIdKey[] = "frameId"; -const char kRequestIdKey[] = "requestId"; const char kSourceTabIdKey[] = "sourceTabId"; const char kSourceUrlKey[] = "sourceUrl"; const char kTabIdKey[] = "tabId"; diff --git a/chrome/browser/extensions/extension_webnavigation_api_constants.h b/chrome/browser/extensions/extension_webnavigation_api_constants.h index aadeebf..e8deb7f 100644 --- a/chrome/browser/extensions/extension_webnavigation_api_constants.h +++ b/chrome/browser/extensions/extension_webnavigation_api_constants.h @@ -13,7 +13,6 @@ namespace extension_webnavigation_api_constants { // Keys. extern const char kErrorKey[]; extern const char kFrameIdKey[]; -extern const char kRequestIdKey[]; extern const char kSourceTabIdKey[]; extern const char kSourceUrlKey[]; extern const char kTabIdKey[]; -- cgit v1.1