diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:39:13 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-31 17:39:13 +0000 |
| commit | 8286f51aaab9c769e70a1bcad5c568cec6636ba0 (patch) | |
| tree | a741bc9016024ee0e092dfcbdc292a3d54c28c34 /content | |
| parent | c8e2646cd5873468fe7497889c8b30da5f3cd2d4 (diff) | |
| download | chromium_src-8286f51aaab9c769e70a1bcad5c568cec6636ba0.zip chromium_src-8286f51aaab9c769e70a1bcad5c568cec6636ba0.tar.gz chromium_src-8286f51aaab9c769e70a1bcad5c568cec6636ba0.tar.bz2 | |
Factor load notification detail structs out of NavigationController and into
their own file in the |content| namespace. Remove un-necessary includes of
navigation_controller.h.
BUG=none
TEST=everything compiles
Review URL: http://codereview.chromium.org/7008018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87319 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
10 files changed, 155 insertions, 128 deletions
diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index 2146acd..2b46ab8 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -213,7 +213,7 @@ class RenderViewHostTestTabContentsObserver : public TabContentsObserver { virtual ~RenderViewHostTestTabContentsObserver() {} virtual void DidNavigateMainFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params) { observed_socket_address_ = params.socket_address; ++navigation_count_; diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc index 564203f..324d6e0 100644 --- a/content/browser/tab_contents/navigation_controller.cc +++ b/content/browser/tab_contents/navigation_controller.cc @@ -18,6 +18,7 @@ #include "content/browser/in_process_webkit/session_storage_namespace.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" @@ -42,13 +43,13 @@ const int kInvalidateAllButShelves = void NotifyPrunedEntries(NavigationController* nav_controller, bool from_front, int count) { - NavigationController::PrunedDetails details; + content::PrunedDetails details; details.from_front = from_front; details.count = count; NotificationService::current()->Notify( NotificationType::NAV_LIST_PRUNED, Source<NavigationController>(nav_controller), - Details<NavigationController::PrunedDetails>(&details)); + Details<content::PrunedDetails>(&details)); } // Ensure the given NavigationEntry has a valid state, so that WebKit does not @@ -499,7 +500,7 @@ void NavigationController::DocumentLoadedInFrame() { bool NavigationController::RendererDidNavigate( const ViewHostMsg_FrameNavigate_Params& params, int extra_invalidate_flags, - LoadCommittedDetails* details) { + content::LoadCommittedDetails* details) { // Save the previous state before we clobber it. if (GetLastCommittedEntry()) { @@ -1090,11 +1091,11 @@ void NavigationController::NavigateToPendingEntry(ReloadType reload_type) { } void NavigationController::NotifyNavigationEntryCommitted( - LoadCommittedDetails* details, + content::LoadCommittedDetails* details, int extra_invalidate_flags) { details->entry = GetActiveEntry(); NotificationDetails notification_details = - Details<LoadCommittedDetails>(details); + Details<content::LoadCommittedDetails>(details); // We need to notify the ssl_manager_ before the tab_contents_ so the // location bar will have up-to-date information about the security style @@ -1136,12 +1137,12 @@ void NavigationController::LoadIfNecessary() { void NavigationController::NotifyEntryChanged(const NavigationEntry* entry, int index) { - EntryChangedDetails det; + content::EntryChangedDetails det; det.changed_entry = entry; det.index = index; NotificationService::current()->Notify(NotificationType::NAV_ENTRY_CHANGED, - Source<NavigationController>(this), - Details<EntryChangedDetails>(&det)); + Source<NavigationController>(this), + Details<content::EntryChangedDetails>(&det)); } void NavigationController::FinishRestore(int selected_index, diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h index d753a29..e36a4b0 100644 --- a/content/browser/tab_contents/navigation_controller.h +++ b/content/browser/tab_contents/navigation_controller.h @@ -27,6 +27,10 @@ class TabContents; class TabNavigation; struct ViewHostMsg_FrameNavigate_Params; +namespace content { +struct LoadCommittedDetails; +} + // A NavigationController maintains the back-forward list for a single tab and // manages all navigation within that list. // @@ -34,96 +38,6 @@ struct ViewHostMsg_FrameNavigate_Params; // make sure that we have at most one TabContents instance per type. class NavigationController { public: - // Notification details ------------------------------------------------------ - - // Provides the details for a NOTIFY_NAV_ENTRY_CHANGED notification. - struct EntryChangedDetails { - // The changed navigation entry after it has been updated. - const NavigationEntry* changed_entry; - - // Indicates the current index in the back/forward list of the entry. - int index; - }; - - // Provides the details for a NOTIFY_NAV_ENTRY_COMMITTED notification. - // TODO(brettw) this mostly duplicates ProvisionalLoadDetails, it would be - // nice to unify these somehow. - struct LoadCommittedDetails { - // By default, the entry will be filled according to a new main frame - // navigation. - LoadCommittedDetails() - : entry(NULL), - type(NavigationType::UNKNOWN), - previous_entry_index(-1), - is_auto(false), - did_replace_entry(false), - is_in_page(false), - is_main_frame(true), - http_status_code(0) { - } - - // The committed entry. This will be the active entry in the controller. - NavigationEntry* entry; - - // The type of navigation that just occurred. Note that not all types of - // navigations in the enum are valid here, since some of them don't actually - // cause a "commit" and won't generate this notification. - NavigationType::Type type; - - // The index of the previously committed navigation entry. This will be -1 - // if there are no previous entries. - int previous_entry_index; - - // The previous URL that the user was on. This may be empty if none. - GURL previous_url; - - // True when this load was non-user initated. This corresponds to a - // a NavigationGestureAuto call from WebKit (see webview_delegate.h). - // We also count reloads and meta-refreshes as "auto" to account for the - // fact that WebKit doesn't always set the user gesture properly in these - // cases (see bug 1051891). - bool is_auto; - - // True if the committed entry has replaced the exisiting one. - // A non-user initiated redirect causes such replacement. - // This is somewhat similiar to is_auto, but not exactly the same. - bool did_replace_entry; - - // True if the navigation was in-page. This means that the active entry's - // URL and the |previous_url| are the same except for reference fragments. - bool is_in_page; - - // True when the main frame was navigated. False means the navigation was a - // sub-frame. - bool is_main_frame; - - // When the committed load is a web page from the renderer, this string - // specifies the security state if the page is secure. - // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from. - // Use SSLManager::DeserializeSecurityInfo to decode it. - std::string serialized_security_info; - - // Returns whether the user probably felt like they navigated somewhere new. - // We often need this logic for showing or hiding something, and this - // returns true only for main frame loads that the user initiated, that go - // to a new page. - bool is_user_initiated_main_frame_load() const { - return !is_auto && !is_in_page && is_main_frame; - } - - // The HTTP status code for this entry.. - int http_status_code; - }; - - // Details sent for NOTIFY_NAV_LIST_PRUNED. - struct PrunedDetails { - // If true, count items were removed from the front of the list, otherwise - // count items were removed from the back of the list. - bool from_front; - - // Number of items removed. - int count; - }; enum ReloadType { NO_RELOAD, // Normal load. @@ -317,7 +231,7 @@ class NavigationController { // added to the flags sent to the delegate's NotifyNavigationStateChanged. bool RendererDidNavigate(const ViewHostMsg_FrameNavigate_Params& params, int extra_invalidate_flags, - LoadCommittedDetails* details); + content::LoadCommittedDetails* details); // Notifies us that we just became active. This is used by the TabContents // so that we know to load URLs that were pending as "lazy" loads. @@ -472,7 +386,7 @@ class NavigationController { // // |extra_invalidate_flags| are an additional set of flags (InvalidateTypes) // added to the flags sent to the delegate's NotifyNavigationStateChanged. - void NotifyNavigationEntryCommitted(LoadCommittedDetails* details, + void NotifyNavigationEntryCommitted(content::LoadCommittedDetails* details, int extra_invalidate_flags); // Updates the virtual URL of an entry to match a new URL, for cases where diff --git a/content/browser/tab_contents/navigation_controller_unittest.cc b/content/browser/tab_contents/navigation_controller_unittest.cc index 29b6cdf..64052f4 100644 --- a/content/browser/tab_contents/navigation_controller_unittest.cc +++ b/content/browser/tab_contents/navigation_controller_unittest.cc @@ -21,6 +21,7 @@ #include "content/browser/renderer_host/test_render_view_host.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/navigation_controller.h" +#include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_delegate.h" @@ -320,7 +321,7 @@ TEST_F(NavigationControllerTest, LoadURL_ExistingPending) { // Before that commits, do a new navigation. const GURL kNewURL("http://see"); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; rvh()->SendNavigate(3, kNewURL); // There should no longer be any pending entry, and the third navigation we @@ -770,7 +771,7 @@ TEST_F(NavigationControllerTest, Redirect) { params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_EQ(0U, notifications.size()); EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); @@ -826,7 +827,7 @@ TEST_F(NavigationControllerTest, PostThenRedirect) { params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_EQ(0U, notifications.size()); EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); @@ -872,7 +873,7 @@ TEST_F(NavigationControllerTest, ImmediateRedirect) { params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_EQ(0U, notifications.size()); EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); @@ -912,7 +913,7 @@ TEST_F(NavigationControllerTest, NewSubframe) { params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_TRUE(notifications.Check1AndReset( NotificationType::NAV_ENTRY_COMMITTED)); @@ -948,7 +949,7 @@ TEST_F(NavigationControllerTest, SubframeOnEmptyPage) { params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_FALSE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_EQ(0U, notifications.size()); } @@ -975,7 +976,7 @@ TEST_F(NavigationControllerTest, AutoSubframe) { params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); // Navigating should do nothing. - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_FALSE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_EQ(0U, notifications.size()); @@ -1006,7 +1007,7 @@ TEST_F(NavigationControllerTest, BackSubframe) { params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); // This should generate a new entry. - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_TRUE(notifications.Check1AndReset( NotificationType::NAV_ENTRY_COMMITTED)); @@ -1090,7 +1091,7 @@ TEST_F(NavigationControllerTest, InPage) { params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); // This should generate a new entry. - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_TRUE(notifications.Check1AndReset( NotificationType::NAV_ENTRY_COMMITTED)); @@ -1171,7 +1172,7 @@ TEST_F(NavigationControllerTest, InPage_Replace) { params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url2)); // This should NOT generate a new entry. - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_TRUE(notifications.Check2AndReset( NotificationType::NAV_LIST_PRUNED, @@ -1222,7 +1223,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url)); // This should NOT generate a new entry. - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_TRUE(notifications.Check2AndReset( NotificationType::NAV_LIST_PRUNED, @@ -1247,7 +1248,7 @@ TEST_F(NavigationControllerTest, ClientRedirectAfterInPageNavigation) { params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url)); // This SHOULD generate a new entry. - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_TRUE(controller().RendererDidNavigate(params, 0, &details)); EXPECT_TRUE(notifications.Check1AndReset( NotificationType::NAV_ENTRY_COMMITTED)); @@ -1281,7 +1282,7 @@ class PrunedListener : public NotificationObserver { const NotificationDetails& details) { if (type == NotificationType::NAV_LIST_PRUNED) { notification_count_++; - details_ = *(Details<NavigationController::PrunedDetails>(details).ptr()); + details_ = *(Details<content::PrunedDetails>(details).ptr()); } } @@ -1289,7 +1290,7 @@ class PrunedListener : public NotificationObserver { int notification_count_; // Details from the last NAV_LIST_PRUNED. - NavigationController::PrunedDetails details_; + content::PrunedDetails details_; private: NotificationRegistrar registrar_; @@ -1379,7 +1380,7 @@ TEST_F(NavigationControllerTest, RestoreNavigate) { params.gesture = NavigationGestureUser; params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; our_controller.RendererDidNavigate(params, 0, &details); // There should be no longer any pending entry and one committed one. This @@ -1644,7 +1645,7 @@ TEST_F(NavigationControllerTest, SameSubframe) { params.gesture = NavigationGestureAuto; params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(subframe)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; EXPECT_FALSE(controller().RendererDidNavigate(params, 0, &details)); // Nothing should have changed. @@ -1671,7 +1672,7 @@ TEST_F(NavigationControllerTest, ViewSourceRedirect) { params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(result_url)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; controller().RendererDidNavigate(params, 0, &details); EXPECT_EQ(ASCIIToUTF16(kExpected), contents()->GetTitle()); @@ -1735,7 +1736,7 @@ TEST_F(NavigationControllerTest, SubframeWhilePending) { params.gesture = NavigationGestureAuto; params.is_post = false; params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url1_sub)); - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; // This should return false meaning that nothing was actually updated. EXPECT_FALSE(controller().RendererDidNavigate(params, 0, &details)); diff --git a/content/browser/tab_contents/navigation_details.h b/content/browser/tab_contents/navigation_details.h new file mode 100644 index 0000000..a31cef1 --- /dev/null +++ b/content/browser/tab_contents/navigation_details.h @@ -0,0 +1,108 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_DETAILS_H_ +#define CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_DETAILS_H_ +#pragma once + +#include <string> +#include "content/common/navigation_types.h" +#include "googleurl/src/gurl.h" + +class NavigationEntry; + +namespace content { + +// Provides the details for a NOTIFY_NAV_ENTRY_COMMITTED notification. +// TODO(brettw) this mostly duplicates ProvisionalLoadDetails, it would be +// nice to unify these somehow. +struct LoadCommittedDetails { + // By default, the entry will be filled according to a new main frame + // navigation. + LoadCommittedDetails() + : entry(NULL), + type(NavigationType::UNKNOWN), + previous_entry_index(-1), + is_auto(false), + did_replace_entry(false), + is_in_page(false), + is_main_frame(true), + http_status_code(0) { + } + + // The committed entry. This will be the active entry in the controller. + NavigationEntry* entry; + + // The type of navigation that just occurred. Note that not all types of + // navigations in the enum are valid here, since some of them don't actually + // cause a "commit" and won't generate this notification. + NavigationType::Type type; + + // The index of the previously committed navigation entry. This will be -1 + // if there are no previous entries. + int previous_entry_index; + + // The previous URL that the user was on. This may be empty if none. + GURL previous_url; + + // True when this load was non-user initated. This corresponds to a + // a NavigationGestureAuto call from WebKit (see webview_delegate.h). + // We also count reloads and meta-refreshes as "auto" to account for the + // fact that WebKit doesn't always set the user gesture properly in these + // cases (see bug 1051891). + bool is_auto; + + // True if the committed entry has replaced the exisiting one. + // A non-user initiated redirect causes such replacement. + // This is somewhat similiar to is_auto, but not exactly the same. + bool did_replace_entry; + + // True if the navigation was in-page. This means that the active entry's + // URL and the |previous_url| are the same except for reference fragments. + bool is_in_page; + + // True when the main frame was navigated. False means the navigation was a + // sub-frame. + bool is_main_frame; + + // When the committed load is a web page from the renderer, this string + // specifies the security state if the page is secure. + // See ViewHostMsg_FrameNavigate_Params.security_info, where it comes from. + // Use SSLManager::DeserializeSecurityInfo to decode it. + std::string serialized_security_info; + + // Returns whether the user probably felt like they navigated somewhere new. + // We often need this logic for showing or hiding something, and this + // returns true only for main frame loads that the user initiated, that go + // to a new page. + bool is_user_initiated_main_frame_load() const { + return !is_auto && !is_in_page && is_main_frame; + } + + // The HTTP status code for this entry.. + int http_status_code; +}; + +// Provides the details for a NOTIFY_NAV_ENTRY_CHANGED notification. +struct EntryChangedDetails { + // The changed navigation entry after it has been updated. + const NavigationEntry* changed_entry; + + // Indicates the current index in the back/forward list of the entry. + int index; +}; + +// Details sent for NOTIFY_NAV_LIST_PRUNED. +struct PrunedDetails { + // If true, count items were removed from the front of the list, otherwise + // count items were removed from the back of the list. + bool from_front; + + // Number of items removed. + int count; +}; + +} // namespace content + +#endif // CONTENT_BROWSER_TAB_CONTENTS_NAVIGATION_DETAILS_H_ diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 3c994af..2f5629f 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -33,6 +33,7 @@ #include "content/browser/renderer_host/resource_request_details.h" #include "content/browser/site_instance.h" #include "content/browser/tab_contents/interstitial_page.h" +#include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_entry.h" #include "content/browser/tab_contents/provisional_load_details.h" #include "content/browser/tab_contents/tab_contents_delegate.h" @@ -1063,7 +1064,7 @@ WebUI::TypeID TabContents::GetWebUITypeForCurrentState() { } void TabContents::DidNavigateMainFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params) { if (opener_web_ui_type_ != WebUI::kNoWebUI) { // If this is a window.open navigation, use the same WebUI as the renderer @@ -1109,7 +1110,7 @@ void TabContents::DidNavigateMainFramePostCommit( void TabContents::DidNavigateAnyFramePostCommit( RenderViewHost* render_view_host, - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params) { // If we navigate, start showing messages again. This does nothing to prevent // a malicious script from spamming messages, since the script could just @@ -1374,7 +1375,7 @@ void TabContents::DidNavigate(RenderViewHost* rvh, if (PageTransition::IsMainFrame(params.transition)) contents_mime_type_ = params.contents_mime_type; - NavigationController::LoadCommittedDetails details; + content::LoadCommittedDetails details; bool did_navigate = controller_.RendererDidNavigate( params, extra_invalidate_flags, &details); diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index a4ec6b2..b3472af 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -588,11 +588,11 @@ class TabContents : public PageNavigator, // not provided since it may be invalid/changed after being committed. The // current navigation entry is in the NavigationController at this point. void DidNavigateMainFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params); void DidNavigateAnyFramePostCommit( RenderViewHost* render_view_host, - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params); // Closes all constrained windows. diff --git a/content/browser/tab_contents/tab_contents_observer.cc b/content/browser/tab_contents/tab_contents_observer.cc index 03f8f75..e3f7027 100644 --- a/content/browser/tab_contents/tab_contents_observer.cc +++ b/content/browser/tab_contents/tab_contents_observer.cc @@ -5,6 +5,7 @@ #include "content/browser/tab_contents/tab_contents_observer.h" #include "content/browser/renderer_host/render_view_host.h" +#include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/tab_contents.h" TabContentsObserver::Registrar::Registrar(TabContentsObserver* observer) @@ -34,12 +35,12 @@ void TabContentsObserver::NavigateToPendingEntry( } void TabContentsObserver::DidNavigateMainFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params) { } void TabContentsObserver::DidNavigateAnyFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params) { } diff --git a/content/browser/tab_contents/tab_contents_observer.h b/content/browser/tab_contents/tab_contents_observer.h index e1b11c9..3456895 100644 --- a/content/browser/tab_contents/tab_contents_observer.h +++ b/content/browser/tab_contents/tab_contents_observer.h @@ -45,10 +45,10 @@ class TabContentsObserver : public IPC::Channel::Listener, const GURL& url, NavigationController::ReloadType reload_type); virtual void DidNavigateMainFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params); virtual void DidNavigateAnyFramePostCommit( - const NavigationController::LoadCommittedDetails& details, + const content::LoadCommittedDetails& details, const ViewHostMsg_FrameNavigate_Params& params); // |render_view_host| is the RenderViewHost for which the provisional load is // happening. diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 806cdfe..59b2c95 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -312,6 +312,7 @@ 'browser/tab_contents/interstitial_page.h', 'browser/tab_contents/navigation_controller.cc', 'browser/tab_contents/navigation_controller.h', + 'browser/tab_contents/navigation_details.h', 'browser/tab_contents/navigation_entry.cc', 'browser/tab_contents/navigation_entry.h', 'browser/tab_contents/page_navigator.h', |