diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-25 03:59:51 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-25 03:59:51 +0000 |
commit | 36fc039f12944d61df900690238a5d0303f457dd (patch) | |
tree | 1f53b1b2a137bb60bf4e696dd5e6cb706833cc2d /chrome/browser/external_tab_container_win.cc | |
parent | 12f75ab37393f57fcac33c39673793f1579b665c (diff) | |
download | chromium_src-36fc039f12944d61df900690238a5d0303f457dd.zip chromium_src-36fc039f12944d61df900690238a5d0303f457dd.tar.gz chromium_src-36fc039f12944d61df900690238a5d0303f457dd.tar.bz2 |
Create a Content API around NavigationEntry that's in content/public/browser. NavigationEntry will be renamed to NavigationEntryImpl in a later change. It now derives from content::NavigationEntry. Most of this change is changing unix_hacker functions to CamelCase and updating callers.
BUG=98716
TBR=brettw
Review URL: http://codereview.chromium.org/9007043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115766 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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 5939275..aee37e5 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -815,7 +815,7 @@ void ExternalTabContainer::Observe(int type, if (commit->http_status_code >= kHttpClientErrorStart && commit->http_status_code <= kHttpServerErrorEnd) { automation_->Send(new AutomationMsg_NavigationFailed( - tab_handle_, commit->http_status_code, commit->entry->url())); + tab_handle_, commit->http_status_code, commit->entry->GetURL())); ignore_next_load_notification_ = true; } else { @@ -957,9 +957,9 @@ bool ExternalTabContainer::InitNavigationInfo(NavigationInfo* nav_info, nav_info->relative_offset = relative_offset; nav_info->navigation_index = tab_contents_->tab_contents()->GetController().GetCurrentEntryIndex(); - nav_info->url = entry->url(); - nav_info->referrer = entry->referrer().url; - nav_info->title = UTF16ToWideHack(entry->title()); + nav_info->url = entry->GetURL(); + nav_info->referrer = entry->GetReferrer().url; + nav_info->title = UTF16ToWideHack(entry->GetTitle()); if (nav_info->title.empty()) nav_info->title = UTF8ToWide(nav_info->url.spec()); |