diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 03:16:58 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 03:16:58 +0000 |
| commit | ec0b6c4eab34c0018869aad1e215aaa3868b3b55 (patch) | |
| tree | 6de6f2eb94d18bb54804d985aaedb9b098f05b39 /chrome/browser/external_tab_container_win.cc | |
| parent | 722119e949c75e5c44fb52b628cd1afbd095f6b8 (diff) | |
| download | chromium_src-ec0b6c4eab34c0018869aad1e215aaa3868b3b55.zip chromium_src-ec0b6c4eab34c0018869aad1e215aaa3868b3b55.tar.gz chromium_src-ec0b6c4eab34c0018869aad1e215aaa3868b3b55.tar.bz2 | |
Changes TabContentsDelegate::ShouldAddNavigationToHistory to be passed
the HistoryAddPageArgs so that they can be cached and used later
on. Refactors some other code that interacts with history so that it
can be called separately as well.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3158029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57458 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/external_tab_container_win.cc')
| -rw-r--r-- | chrome/browser/external_tab_container_win.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index ba7202b..d3a7684 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -16,6 +16,7 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_toggle_action.h" +#include "chrome/browser/history/history_types.h" #include "chrome/browser/load_notification_details.h" #include "chrome/browser/page_info_window.h" #include "chrome/browser/profile.h" @@ -283,10 +284,10 @@ ExternalTabContainer* // ExternalTabContainer, TabContentsDelegate implementation: void ExternalTabContainer::OpenURLFromTab(TabContents* source, - const GURL& url, - const GURL& referrer, - WindowOpenDisposition disposition, - PageTransition::Type transition) { + const GURL& url, + const GURL& referrer, + WindowOpenDisposition disposition, + PageTransition::Type transition) { if (pending()) { PendingTopLevelNavigation url_request; url_request.disposition = disposition; @@ -323,7 +324,9 @@ void ExternalTabContainer::OpenURLFromTab(TabContents* source, NavigationController::LoadCommittedDetails details; details.did_replace_entry = false; - tab_contents_->UpdateHistoryForNavigation(url, details, params); + scoped_refptr<history::HistoryAddPageArgs> add_page_args( + tab_contents_->CreateHistoryAddPageArgs(url, details, params)); + tab_contents_->UpdateHistoryForNavigation(add_page_args); } break; default: |