Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Side by Side Diff: chrome/browser/sessions/session_types.cc

Issue 165485: Renames the NavigationEntry::display_url() to virtual_url(). (Closed)
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sessions/session_types.h" 5 #include "chrome/browser/sessions/session_types.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "chrome/browser/tab_contents/navigation_entry.h" 8 #include "chrome/browser/tab_contents/navigation_entry.h"
9 9
10 // TabNavigation -------------------------------------------------------------- 10 // TabNavigation --------------------------------------------------------------
11 11
12 // static 12 // static
13 NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const { 13 NavigationEntry* TabNavigation::ToNavigationEntry(int page_id) const {
14 NavigationEntry* entry = new NavigationEntry( 14 NavigationEntry* entry = new NavigationEntry(
15 NULL, // The site instance for restored tabs is sent on navigation 15 NULL, // The site instance for restored tabs is sent on navigation
16 // (TabContents::GetSiteInstanceForEntry). 16 // (TabContents::GetSiteInstanceForEntry).
17 page_id, 17 page_id,
18 url_, 18 url_,
19 referrer_, 19 referrer_,
20 title_, 20 title_,
21 // Use a transition type of reload so that we don't incorrectly 21 // Use a transition type of reload so that we don't incorrectly
22 // increase the typed count. 22 // increase the typed count.
23 PageTransition::RELOAD); 23 PageTransition::RELOAD);
24 entry->set_display_url(url_); 24 entry->set_virtual_url(url_);
25 entry->set_content_state(state_); 25 entry->set_content_state(state_);
26 entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA); 26 entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA);
27 return entry; 27 return entry;
28 } 28 }
29 29
30 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) { 30 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) {
31 url_ = entry.display_url(); 31 url_ = entry.virtual_url();
32 referrer_ = entry.referrer(); 32 referrer_ = entry.referrer();
33 title_ = entry.title(); 33 title_ = entry.title();
34 state_ = entry.content_state(); 34 state_ = entry.content_state();
35 transition_ = entry.transition_type(); 35 transition_ = entry.transition_type();
36 type_mask_ = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0; 36 type_mask_ = entry.has_post_data() ? TabNavigation::HAS_POST_DATA : 0;
37 } 37 }
OLDNEW
« no previous file with comments | « chrome/browser/sessions/base_session_service.cc ('k') | chrome/browser/tab_contents/interstitial_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698