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/sync | |
| 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/sync')
| -rw-r--r-- | chrome/browser/sync/glue/session_model_associator.cc | 11 | ||||
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_session_unittest.cc | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc index 71335e4..8eabce4 100644 --- a/chrome/browser/sync/glue/session_model_associator.cc +++ b/chrome/browser/sync/glue/session_model_associator.cc @@ -339,11 +339,11 @@ bool SessionModelAssociator::WriteTabContentsToSyncModel( const NavigationEntry* entry = (i == pending_index) ? tab.GetPendingEntry() : tab.GetEntryAtIndex(i); DCHECK(entry); - if (entry->virtual_url().is_valid()) { + if (entry->GetVirtualURL().is_valid()) { if (i == max_index - 1) { DVLOG(1) << "Associating tab " << tab_id << " with sync id " << sync_id - << ", url " << entry->virtual_url().possibly_invalid_spec() - << " and title " << entry->title(); + << ", url " << entry->GetVirtualURL().possibly_invalid_spec() + << " and title " << entry->GetTitle(); } TabNavigation tab_nav; tab_nav.SetFromNavigationEntry(*entry); @@ -1067,8 +1067,9 @@ bool SessionModelAssociator::IsValidTab(const SyncedTabDelegate& tab) const { const NavigationEntry* entry = tab.GetActiveEntry(); if (!entry) return false; - if (entry->virtual_url().is_valid() && - (entry->virtual_url().GetOrigin() != GURL(chrome::kChromeUINewTabURL) || + if (entry->GetVirtualURL().is_valid() && + (entry->GetVirtualURL().GetOrigin() != + GURL(chrome::kChromeUINewTabURL) || tab.GetEntryCount() > 1)) { return true; } diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index 6bede13..44224e8 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -359,15 +359,15 @@ TEST_F(ProfileSyncServiceSessionTest, WriteFilledSessionToNode) { SessionModelAssociator::TabLinksMap::iterator iter = tab_map.begin(); ASSERT_EQ(2, iter->second.tab()->GetEntryCount()); ASSERT_EQ(GURL("http://foo/1"), iter->second.tab()-> - GetEntryAtIndex(0)->virtual_url()); + GetEntryAtIndex(0)->GetVirtualURL()); ASSERT_EQ(GURL("http://foo/2"), iter->second.tab()-> - GetEntryAtIndex(1)->virtual_url()); + GetEntryAtIndex(1)->GetVirtualURL()); iter++; ASSERT_EQ(2, iter->second.tab()->GetEntryCount()); ASSERT_EQ(GURL("http://bar/1"), iter->second.tab()-> - GetEntryAtIndex(0)->virtual_url()); + GetEntryAtIndex(0)->GetVirtualURL()); ASSERT_EQ(GURL("http://bar/2"), iter->second.tab()-> - GetEntryAtIndex(1)->virtual_url()); + GetEntryAtIndex(1)->GetVirtualURL()); } // Test that we fail on a failed model association. |