summaryrefslogtreecommitdiffstats
path: root/chrome_frame/chrome_frame_automation.cc
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 00:53:23 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-19 00:53:23 +0000
commita1800e8c451736dea5663ae461454ab663d05bc4 (patch)
tree87ff9157562b9616139bb6154a06902e5ede5287 /chrome_frame/chrome_frame_automation.cc
parent4f03cbccc4c09db3f053b74393961e8728bceeec (diff)
downloadchromium_src-a1800e8c451736dea5663ae461454ab663d05bc4.zip
chromium_src-a1800e8c451736dea5663ae461454ab663d05bc4.tar.gz
chromium_src-a1800e8c451736dea5663ae461454ab663d05bc4.tar.bz2
Back/Forward support for url fragments
Added support for anchor (url fragments). this involves mainly implementing IPersistHistory. The rest of the stuff is a song and dance to get called in IPersistHistory in the first place and then behave correctly when we do. BUG=23981 TEst=unit tests added and back forward with '#' URLs, sub frames etc. Review URL: http://codereview.chromium.org/371004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
-rw-r--r--chrome_frame/chrome_frame_automation.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 8dbf795..7f4e218 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -75,6 +75,7 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher
case AutomationMsg_ConnectExternalTab::ID:
InvokeCallback<Tuple3<HWND, HWND, int> >(msg, origin);
break;
+ case AutomationMsg_NavigateExternalTabAtIndex::ID:
case AutomationMsg_NavigateInExternalTab::ID:
InvokeCallback<Tuple1<AutomationMsg_NavigationResponseValues> >(msg,
origin);
@@ -144,7 +145,6 @@ struct LaunchTimeStats {
#endif
};
-
ProxyFactory::ProxyCacheEntry::ProxyCacheEntry(const std::wstring& profile)
: proxy(NULL), profile_name(profile), ref_count(1),
launch_result(AutomationLaunchResult(-1)) {
@@ -885,7 +885,6 @@ void ChromeFrameAutomationClient::SetParentWindow(HWND parent_window) {
}
if (!SetParent(parent_window)) {
- NOTREACHED();
DLOG(WARNING) << "Failed to set parent window for automation window. "
<< "Error = "
<< GetLastError();