diff options
Diffstat (limited to 'chrome/browser/tab_contents')
-rw-r--r-- | chrome/browser/tab_contents/provisional_load_details.cc | 1 | ||||
-rw-r--r-- | chrome/browser/tab_contents/provisional_load_details.h | 9 | ||||
-rw-r--r-- | chrome/browser/tab_contents/tab_contents.cc | 24 |
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) { |