summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 13:00:33 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 13:00:33 +0000
commitb16b2a9d2f8107b6803c990cebf92f910ae238d5 (patch)
tree3140930ab7c5b5045aecfc06e25e21c8ea017215 /chrome/browser/tab_contents
parent4c028ff10f9a8a025d1490909ea257056bae0ad9 (diff)
downloadchromium_src-b16b2a9d2f8107b6803c990cebf92f910ae238d5.zip
chromium_src-b16b2a9d2f8107b6803c990cebf92f910ae238d5.tar.gz
chromium_src-b16b2a9d2f8107b6803c990cebf92f910ae238d5.tar.bz2
Revert 59641 - Add the onBeforeNavigate and onErrorOccured events to the webNavigation API.
Also, rewrite the onCommitted event such that AUTO_SUBFRAME events are also registered. The frameId and the requestId fields are still unimplemented. Also, there occur navigation events after an error is reported. BUG=50943 TEST=WebNavigationEvents Review URL: http://codereview.chromium.org/3436002 TBR=jochen@chromium.org Review URL: http://codereview.chromium.org/3389012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r--chrome/browser/tab_contents/provisional_load_details.cc1
-rw-r--r--chrome/browser/tab_contents/provisional_load_details.h9
-rw-r--r--chrome/browser/tab_contents/tab_contents.cc24
3 files changed, 0 insertions, 34 deletions
diff --git a/chrome/browser/tab_contents/provisional_load_details.cc b/chrome/browser/tab_contents/provisional_load_details.cc
index e1e85d2..3bea977 100644
--- a/chrome/browser/tab_contents/provisional_load_details.cc
+++ b/chrome/browser/tab_contents/provisional_load_details.cc
@@ -13,7 +13,6 @@ ProvisionalLoadDetails::ProvisionalLoadDetails(bool is_main_frame,
const std::string& security_info,
bool is_content_filtered)
: error_code_(net::OK),
- transition_type_(PageTransition::LINK),
url_(url),
is_main_frame_(is_main_frame),
is_in_page_navigation_(is_in_page_navigation),
diff --git a/chrome/browser/tab_contents/provisional_load_details.h b/chrome/browser/tab_contents/provisional_load_details.h
index 2073db0..92ac9b1 100644
--- a/chrome/browser/tab_contents/provisional_load_details.h
+++ b/chrome/browser/tab_contents/provisional_load_details.h
@@ -9,7 +9,6 @@
#include <string>
#include "base/basictypes.h"
-#include "chrome/common/page_transition_types.h"
#include "googleurl/src/gurl.h"
// This class captures some of the information associated to the provisional
@@ -33,13 +32,6 @@ class ProvisionalLoadDetails {
void set_error_code(int error_code) { error_code_ = error_code; }
int error_code() const { return error_code_; }
- void set_transition_type(PageTransition::Type transition_type) {
- transition_type_ = transition_type;
- }
- PageTransition::Type transition_type() const {
- return transition_type_;
- }
-
const GURL& url() const { return url_; }
bool main_frame() const { return is_main_frame_; }
@@ -58,7 +50,6 @@ class ProvisionalLoadDetails {
private:
int error_code_;
- PageTransition::Type transition_type_;
GURL url_;
bool is_main_frame_;
bool is_in_page_navigation_;
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 1d702bd..67428ce 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -2452,30 +2452,6 @@ void TabContents::DidNavigate(RenderViewHost* rvh,
bool did_navigate = controller_.RendererDidNavigate(
params, extra_invalidate_flags, &details);
- // Send notification about committed provisional loads. This notification is
- // different from the NAV_ENTRY_COMMITTED notification which doesn't include
- // the actual URL navigated to and isn't sent for AUTO_SUBFRAME navigations.
- if (details.type != NavigationType::NAV_IGNORE) {
- ProvisionalLoadDetails load_details(details.is_main_frame,
- details.is_in_page,
- params.url, std::string(), false);
- load_details.set_transition_type(params.transition);
- // Whether or not a page transition was triggered by going backward or
- // forward in the history is only stored in the navigation controller's
- // entry list.
- if (did_navigate &&
- (controller_.GetActiveEntry()->transition_type() &
- PageTransition::FORWARD_BACK)) {
- load_details.set_transition_type(
- params.transition | PageTransition::FORWARD_BACK);
- }
- NotificationService::current()->Notify(
- NotificationType::FRAME_PROVISIONAL_LOAD_COMMITTED,
- Source<NavigationController>(&controller_),
- Details<ProvisionalLoadDetails>(&load_details));
-
- }
-
// Update history. Note that this needs to happen after the entry is complete,
// which WillNavigate[Main,Sub]Frame will do before this function is called.
if (params.should_update_history) {