| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #ifndef CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "chrome/browser/sessions/session_restore.h" |
| 10 #include "components/sessions/core/session_types.h" | 11 #include "components/sessions/core/session_types.h" |
| 11 | 12 |
| 12 class Browser; | 13 class Browser; |
| 13 | 14 |
| 14 namespace content { | 15 namespace content { |
| 15 class SessionStorageNamespace; | 16 class SessionStorageNamespace; |
| 16 class WebContents; | 17 class WebContents; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace sessions { | 20 namespace sessions { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 36 content::WebContents* AddRestoredTab( | 37 content::WebContents* AddRestoredTab( |
| 37 Browser* browser, | 38 Browser* browser, |
| 38 const std::vector<sessions::SerializedNavigationEntry>& navigations, | 39 const std::vector<sessions::SerializedNavigationEntry>& navigations, |
| 39 int tab_index, | 40 int tab_index, |
| 40 int selected_navigation, | 41 int selected_navigation, |
| 41 const std::string& extension_app_id, | 42 const std::string& extension_app_id, |
| 42 bool select, | 43 bool select, |
| 43 bool pin, | 44 bool pin, |
| 44 bool from_last_session, | 45 bool from_last_session, |
| 45 content::SessionStorageNamespace* storage_namespace, | 46 content::SessionStorageNamespace* storage_namespace, |
| 46 const std::string& user_agent_override); | 47 const std::string& user_agent_override, |
| 48 base::Optional<RestoreOrigin::Type> restore_origin_type = base::nullopt); |
| 47 | 49 |
| 48 // Replaces the state of the currently selected tab with the session | 50 // Replaces the state of the currently selected tab with the session |
| 49 // history restored from the SessionRestore system. Returns the WebContents of | 51 // history restored from the SessionRestore system. Returns the WebContents of |
| 50 // the restored tab. | 52 // the restored tab. |
| 51 content::WebContents* ReplaceRestoredTab( | 53 content::WebContents* ReplaceRestoredTab( |
| 52 Browser* browser, | 54 Browser* browser, |
| 53 const std::vector<sessions::SerializedNavigationEntry>& navigations, | 55 const std::vector<sessions::SerializedNavigationEntry>& navigations, |
| 54 int selected_navigation, | 56 int selected_navigation, |
| 55 bool from_last_session, | 57 bool from_last_session, |
| 56 const std::string& extension_app_id, | 58 const std::string& extension_app_id, |
| 57 content::SessionStorageNamespace* session_storage_namespace, | 59 content::SessionStorageNamespace* session_storage_namespace, |
| 58 const std::string& user_agent_override); | 60 const std::string& user_agent_override); |
| 59 | 61 |
| 60 | 62 |
| 61 } // namespace chrome | 63 } // namespace chrome |
| 62 | 64 |
| 63 #endif // CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ | 65 #endif // CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ |
| OLD | NEW |