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/ui/browser_tabstrip.h" | 5 #include "chrome/browser/ui/browser_tabstrip.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" | 9 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" |
10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 } | 153 } |
154 | 154 |
155 void CloseAllTabs(Browser* browser) { | 155 void CloseAllTabs(Browser* browser) { |
156 browser->tab_strip_model()->CloseAllTabs(); | 156 browser->tab_strip_model()->CloseAllTabs(); |
157 } | 157 } |
158 | 158 |
159 TabContents* TabContentsFactory( | 159 TabContents* TabContentsFactory( |
160 Profile* profile, | 160 Profile* profile, |
161 content::SiteInstance* site_instance, | 161 content::SiteInstance* site_instance, |
162 int routing_id, | 162 int routing_id, |
| 163 const content::WebContents* base_web_contents) { |
| 164 return new TabContents(content::WebContents::Create(profile, |
| 165 site_instance, |
| 166 routing_id, |
| 167 base_web_contents)); |
| 168 } |
| 169 |
| 170 TabContents* TabContentsFactoryWithSessionStorage( |
| 171 Profile* profile, |
| 172 content::SiteInstance* site_instance, |
| 173 int routing_id, |
163 const content::WebContents* base_web_contents, | 174 const content::WebContents* base_web_contents, |
164 content::SessionStorageNamespace* session_storage_namespace) { | 175 const content::SessionStorageNamespaceMap& session_storage_namespace_map) { |
165 return new TabContents(content::WebContents::Create( | 176 return new TabContents( |
166 profile, | 177 content::WebContents::CreateWithSessionStorage( |
167 site_instance, | 178 profile, |
168 routing_id, | 179 site_instance, |
169 base_web_contents, | 180 routing_id, |
170 session_storage_namespace)); | 181 base_web_contents, |
| 182 session_storage_namespace_map)); |
171 } | 183 } |
172 | 184 |
173 } // namespace chrome | 185 } // namespace chrome |
OLD | NEW |