summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_active_document.h
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-15 00:28:45 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-15 00:28:45 +0000
commit747bca1dea711a6bd3c38dec7e0903bb9e0035a9 (patch)
tree204c3a6b4a1d38a06c77e75250089130bbf5f603 /chrome_frame/chrome_active_document.h
parent9f701fdbb0388152a3ce5ef01cc9b8fa43a5a315 (diff)
downloadchromium_src-747bca1dea711a6bd3c38dec7e0903bb9e0035a9.zip
chromium_src-747bca1dea711a6bd3c38dec7e0903bb9e0035a9.tar.gz
chromium_src-747bca1dea711a6bd3c38dec7e0903bb9e0035a9.tar.bz2
Fix a ChromeFrame Back Forward navigation issue which occurs when we modify the IE history
while processing a navigation update received for a tab loading state change. This is incorrectly treated as an internal navigation which messes up the history. Fix is to not treat the tab loading state change notification as an internal navigation. Fixes bug http://code.google.com/p/chromium/issues/detail?id=69096 BUG=69096 TEST=None at this point. Review URL: http://codereview.chromium.org/6284002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71524 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.h')
-rw-r--r--chrome_frame/chrome_active_document.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome_frame/chrome_active_document.h b/chrome_frame/chrome_active_document.h
index 0050d14..84a6f88 100644
--- a/chrome_frame/chrome_active_document.h
+++ b/chrome_frame/chrome_active_document.h
@@ -369,7 +369,7 @@ END_EXEC_COMMAND_MAP()
// A helper method that updates our internal navigation state
// as well as IE's navigation state (viz Title and current URL).
// The navigation_flags is a TabContents::InvalidateTypes enum
- void UpdateNavigationState(const NavigationInfo& nav_info);
+ void UpdateNavigationState(const NavigationInfo& nav_info, int flags);
TabProxy* GetTabProxy() const {
if (automation_client_.get())
@@ -442,7 +442,8 @@ END_EXEC_COMMAND_MAP()
// Returns true if the NavigationInfo object passed in represents a new
// navigation initiated by the renderer.
- bool IsNewNavigation(const NavigationInfo& new_navigation_info) const;
+ bool IsNewNavigation(const NavigationInfo& new_navigation_info,
+ int flags) const;
protected:
typedef std::map<int, OLECMDF> CommandStatusMap;