summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 17:59:39 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 17:59:39 +0000
commita1955adfe729e84c859264fea19fa21e7ffccde6 (patch)
tree004a90b9846a717bfad5f8735d11de2a84188fd6
parent506fbb4d51032afeb070fbec394085cb06bb1cb1 (diff)
downloadchromium_src-a1955adfe729e84c859264fea19fa21e7ffccde6.zip
chromium_src-a1955adfe729e84c859264fea19fa21e7ffccde6.tar.gz
chromium_src-a1955adfe729e84c859264fea19fa21e7ffccde6.tar.bz2
Add referrer to the NavigationInfo struct.
TEST=n/a BUG=none Review URL: http://codereview.chromium.org/3036030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54562 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/external_tab_container_win.cc1
-rw-r--r--chrome/test/automation/automation_messages.h5
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
index c32da01..1093c45 100644
--- a/chrome/browser/external_tab_container_win.cc
+++ b/chrome/browser/external_tab_container_win.cc
@@ -767,6 +767,7 @@ bool ExternalTabContainer::InitNavigationInfo(IPC::NavigationInfo* nav_info,
nav_info->navigation_index =
tab_contents_->controller().GetCurrentEntryIndex();
nav_info->url = entry->url();
+ nav_info->referrer = entry->referrer();
nav_info->title = UTF16ToWideHack(entry->title());
if (nav_info->title.empty())
nav_info->title = UTF8ToWide(nav_info->url.spec());
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index 996bce8..cb4aa88 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -449,6 +449,7 @@ struct NavigationInfo {
int navigation_index;
std::wstring title;
GURL url;
+ GURL referrer;
SecurityStyle security_style;
bool displayed_insecure_content;
bool ran_insecure_content;
@@ -464,6 +465,7 @@ struct ParamTraits<NavigationInfo> {
WriteParam(m, p.navigation_index);
WriteParam(m, p.title);
WriteParam(m, p.url);
+ WriteParam(m, p.referrer);
WriteParam(m, p.security_style);
WriteParam(m, p.displayed_insecure_content);
WriteParam(m, p.ran_insecure_content);
@@ -474,6 +476,7 @@ struct ParamTraits<NavigationInfo> {
ReadParam(m, iter, &p->navigation_index) &&
ReadParam(m, iter, &p->title) &&
ReadParam(m, iter, &p->url) &&
+ ReadParam(m, iter, &p->referrer) &&
ReadParam(m, iter, &p->security_style) &&
ReadParam(m, iter, &p->displayed_insecure_content) &&
ReadParam(m, iter, &p->ran_insecure_content);
@@ -490,6 +493,8 @@ struct ParamTraits<NavigationInfo> {
l->append(L", ");
LogParam(p.url, l);
l->append(L", ");
+ LogParam(p.referrer, l);
+ l->append(L", ");
LogParam(p.security_style, l);
l->append(L", ");
LogParam(p.displayed_insecure_content, l);