OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser/tab_contents/navigation_controller.h" | 10 #include "content/browser/tab_contents/navigation_controller.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 | 59 |
60 // static | 60 // static |
61 NavigationEntry* TabNavigation::ToNavigationEntry(int page_id, | 61 NavigationEntry* TabNavigation::ToNavigationEntry(int page_id, |
62 Profile *profile) const { | 62 Profile *profile) const { |
63 NavigationEntry* entry = NavigationController::CreateNavigationEntry( | 63 NavigationEntry* entry = NavigationController::CreateNavigationEntry( |
64 virtual_url_, | 64 virtual_url_, |
65 referrer_, | 65 referrer_, |
66 // Use a transition type of reload so that we don't incorrectly | 66 // Use a transition type of reload so that we don't incorrectly |
67 // increase the typed count. | 67 // increase the typed count. |
68 content::PAGE_TRANSITION_RELOAD, | 68 content::PAGE_TRANSITION_RELOAD, |
| 69 false, |
69 // The extra headers are not sync'ed across sessions. | 70 // The extra headers are not sync'ed across sessions. |
70 std::string(), | 71 std::string(), |
71 profile); | 72 profile); |
72 | 73 |
73 entry->set_page_id(page_id); | 74 entry->set_page_id(page_id); |
74 entry->set_title(title_); | 75 entry->set_title(title_); |
75 entry->set_content_state(state_); | 76 entry->set_content_state(state_); |
76 entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA); | 77 entry->set_has_post_data(type_mask_ & TabNavigation::HAS_POST_DATA); |
77 | 78 |
78 return entry; | 79 return entry; |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 SessionWindow::SessionWindow() | 116 SessionWindow::SessionWindow() |
116 : selected_tab_index(-1), | 117 : selected_tab_index(-1), |
117 type(Browser::TYPE_TABBED), | 118 type(Browser::TYPE_TABBED), |
118 is_constrained(true), | 119 is_constrained(true), |
119 show_state(ui::SHOW_STATE_DEFAULT) { | 120 show_state(ui::SHOW_STATE_DEFAULT) { |
120 } | 121 } |
121 | 122 |
122 SessionWindow::~SessionWindow() { | 123 SessionWindow::~SessionWindow() { |
123 STLDeleteElements(&tabs); | 124 STLDeleteElements(&tabs); |
124 } | 125 } |
OLD | NEW |