OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "content/public/browser/navigation_controller.h" | 10 #include "content/public/browser/navigation_controller.h" |
11 #include "content/public/browser/navigation_entry.h" | 11 #include "content/public/browser/navigation_entry.h" |
12 | 12 |
13 using content::NavigationEntry; | 13 using content::NavigationEntry; |
14 | 14 |
15 // TabNavigation -------------------------------------------------------------- | 15 // TabNavigation -------------------------------------------------------------- |
16 | 16 |
17 TabNavigation::TabNavigation() | 17 TabNavigation::TabNavigation() |
18 : transition_(content::PAGE_TRANSITION_TYPED), | 18 : transition_(content::PAGE_TRANSITION_TYPED), |
19 type_mask_(0), | 19 type_mask_(0), |
20 post_id_(-1), | 20 post_id_(-1), |
21 index_(-1) { | 21 index_(-1), |
| 22 is_overriding_user_agent_(false) { |
22 } | 23 } |
23 | 24 |
24 TabNavigation::TabNavigation(int index, | 25 TabNavigation::TabNavigation(int index, |
25 const GURL& virtual_url, | 26 const GURL& virtual_url, |
26 const content::Referrer& referrer, | 27 const content::Referrer& referrer, |
27 const string16& title, | 28 const string16& title, |
28 const std::string& state, | 29 const std::string& state, |
29 content::PageTransition transition) | 30 content::PageTransition transition) |
30 : virtual_url_(virtual_url), | 31 : virtual_url_(virtual_url), |
31 referrer_(referrer), | 32 referrer_(referrer), |
32 title_(title), | 33 title_(title), |
33 state_(state), | 34 state_(state), |
34 transition_(transition), | 35 transition_(transition), |
35 type_mask_(0), | 36 type_mask_(0), |
36 post_id_(-1), | 37 post_id_(-1), |
37 index_(index) { | 38 index_(index), |
| 39 is_overriding_user_agent_(false) { |
38 } | 40 } |
39 | 41 |
40 TabNavigation::TabNavigation(const TabNavigation& tab) | 42 TabNavigation::TabNavigation(const TabNavigation& tab) |
41 : virtual_url_(tab.virtual_url_), | 43 : virtual_url_(tab.virtual_url_), |
42 referrer_(tab.referrer_), | 44 referrer_(tab.referrer_), |
43 title_(tab.title_), | 45 title_(tab.title_), |
44 state_(tab.state_), | 46 state_(tab.state_), |
45 transition_(tab.transition_), | 47 transition_(tab.transition_), |
46 type_mask_(tab.type_mask_), | 48 type_mask_(tab.type_mask_), |
47 post_id_(-1), | 49 post_id_(-1), |
48 index_(tab.index_), | 50 index_(tab.index_), |
49 original_request_url_(tab.original_request_url_) { | 51 original_request_url_(tab.original_request_url_), |
| 52 is_overriding_user_agent_(tab.is_overriding_user_agent_) { |
50 } | 53 } |
51 | 54 |
52 TabNavigation::~TabNavigation() { | 55 TabNavigation::~TabNavigation() { |
53 } | 56 } |
54 | 57 |
55 TabNavigation& TabNavigation::operator=(const TabNavigation& tab) { | 58 TabNavigation& TabNavigation::operator=(const TabNavigation& tab) { |
56 virtual_url_ = tab.virtual_url_; | 59 virtual_url_ = tab.virtual_url_; |
57 referrer_ = tab.referrer_; | 60 referrer_ = tab.referrer_; |
58 title_ = tab.title_; | 61 title_ = tab.title_; |
59 state_ = tab.state_; | 62 state_ = tab.state_; |
60 transition_ = tab.transition_; | 63 transition_ = tab.transition_; |
61 type_mask_ = tab.type_mask_; | 64 type_mask_ = tab.type_mask_; |
62 post_id_ = tab.post_id_; | 65 post_id_ = tab.post_id_; |
63 index_ = tab.index_; | 66 index_ = tab.index_; |
64 original_request_url_ = tab.original_request_url_; | 67 original_request_url_ = tab.original_request_url_; |
| 68 is_overriding_user_agent_ = tab.is_overriding_user_agent_; |
65 return *this; | 69 return *this; |
66 } | 70 } |
67 | 71 |
68 // static | 72 // static |
69 NavigationEntry* TabNavigation::ToNavigationEntry( | 73 NavigationEntry* TabNavigation::ToNavigationEntry( |
70 int page_id, Profile *profile) const { | 74 int page_id, Profile *profile) const { |
71 NavigationEntry* entry = content::NavigationController::CreateNavigationEntry( | 75 NavigationEntry* entry = content::NavigationController::CreateNavigationEntry( |
72 virtual_url_, | 76 virtual_url_, |
73 referrer_, | 77 referrer_, |
74 // Use a transition type of reload so that we don't incorrectly | 78 // Use a transition type of reload so that we don't incorrectly |
75 // increase the typed count. | 79 // increase the typed count. |
76 content::PAGE_TRANSITION_RELOAD, | 80 content::PAGE_TRANSITION_RELOAD, |
77 false, | 81 false, |
78 // The extra headers are not sync'ed across sessions. | 82 // The extra headers are not sync'ed across sessions. |
79 std::string(), | 83 std::string(), |
80 profile); | 84 profile); |
81 | 85 |
82 entry->SetPageID(page_id); | 86 entry->SetPageID(page_id); |
83 entry->SetTitle(title_); | 87 entry->SetTitle(title_); |
84 entry->SetContentState(state_); | 88 entry->SetContentState(state_); |
85 entry->SetHasPostData(type_mask_ & TabNavigation::HAS_POST_DATA); | 89 entry->SetHasPostData(type_mask_ & TabNavigation::HAS_POST_DATA); |
86 entry->SetPostID(post_id_); | 90 entry->SetPostID(post_id_); |
87 entry->SetOriginalRequestURL(original_request_url_); | 91 entry->SetOriginalRequestURL(original_request_url_); |
| 92 entry->SetIsOverridingUserAgent(is_overriding_user_agent_); |
88 | 93 |
89 return entry; | 94 return entry; |
90 } | 95 } |
91 | 96 |
92 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) { | 97 void TabNavigation::SetFromNavigationEntry(const NavigationEntry& entry) { |
93 virtual_url_ = entry.GetVirtualURL(); | 98 virtual_url_ = entry.GetVirtualURL(); |
94 referrer_ = entry.GetReferrer(); | 99 referrer_ = entry.GetReferrer(); |
95 title_ = entry.GetTitle(); | 100 title_ = entry.GetTitle(); |
96 state_ = entry.GetContentState(); | 101 state_ = entry.GetContentState(); |
97 transition_ = entry.GetTransitionType(); | 102 transition_ = entry.GetTransitionType(); |
98 type_mask_ = entry.GetHasPostData() ? TabNavigation::HAS_POST_DATA : 0; | 103 type_mask_ = entry.GetHasPostData() ? TabNavigation::HAS_POST_DATA : 0; |
99 post_id_ = entry.GetPostID(); | 104 post_id_ = entry.GetPostID(); |
100 original_request_url_ = entry.GetOriginalRequestURL(); | 105 original_request_url_ = entry.GetOriginalRequestURL(); |
| 106 is_overriding_user_agent_ = entry.GetIsOverridingUserAgent(); |
101 } | 107 } |
102 | 108 |
103 // static | 109 // static |
104 void TabNavigation::CreateNavigationEntriesFromTabNavigations( | 110 void TabNavigation::CreateNavigationEntriesFromTabNavigations( |
105 Profile* profile, | 111 Profile* profile, |
106 const std::vector<TabNavigation>& navigations, | 112 const std::vector<TabNavigation>& navigations, |
107 std::vector<NavigationEntry*>* entries) { | 113 std::vector<NavigationEntry*>* entries) { |
108 int page_id = 0; | 114 int page_id = 0; |
109 for (std::vector<TabNavigation>::const_iterator i = | 115 for (std::vector<TabNavigation>::const_iterator i = |
110 navigations.begin(); i != navigations.end(); ++i, ++page_id) { | 116 navigations.begin(); i != navigations.end(); ++i, ++page_id) { |
(...skipping 17 matching lines...) Expand all Loading... |
128 SessionWindow::SessionWindow() | 134 SessionWindow::SessionWindow() |
129 : selected_tab_index(-1), | 135 : selected_tab_index(-1), |
130 type(Browser::TYPE_TABBED), | 136 type(Browser::TYPE_TABBED), |
131 is_constrained(true), | 137 is_constrained(true), |
132 show_state(ui::SHOW_STATE_DEFAULT) { | 138 show_state(ui::SHOW_STATE_DEFAULT) { |
133 } | 139 } |
134 | 140 |
135 SessionWindow::~SessionWindow() { | 141 SessionWindow::~SessionWindow() { |
136 STLDeleteElements(&tabs); | 142 STLDeleteElements(&tabs); |
137 } | 143 } |
OLD | NEW |