| 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 #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ | 5 #ifndef CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ |
| 6 #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ | 6 #define CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 // Indicates the active tab of the supplied browser should be closed. | 24 // Indicates the active tab of the supplied browser should be closed. |
| 25 CLOBBER_CURRENT_TAB = 1 << 0, | 25 CLOBBER_CURRENT_TAB = 1 << 0, |
| 26 | 26 |
| 27 // Indicates that if there is a problem restoring the last session then a | 27 // Indicates that if there is a problem restoring the last session then a |
| 28 // new tabbed browser should be created. | 28 // new tabbed browser should be created. |
| 29 ALWAYS_CREATE_TABBED_BROWSER = 1 << 1, | 29 ALWAYS_CREATE_TABBED_BROWSER = 1 << 1, |
| 30 | 30 |
| 31 // Restore blocks until complete. This is intended for use during startup | 31 // Restore blocks until complete. This is intended for use during startup |
| 32 // when we want to block until restore is complete. | 32 // when we want to block until restore is complete. |
| 33 SYNCHRONOUS = 1 << 2, | 33 SYNCHRONOUS = 1 << 2, |
| 34 |
| 35 // Restore session state, such as session cookies. |
| 36 RESTORE_SESSION_STATE = 1 << 3, |
| 34 }; | 37 }; |
| 35 | 38 |
| 36 // Restores the last session. |behavior| is a bitmask of Behaviors, see it | 39 // Restores the last session. |behavior| is a bitmask of Behaviors, see it |
| 37 // for details. If |browser| is non-null the tabs for the first window are | 40 // for details. If |browser| is non-null the tabs for the first window are |
| 38 // added to it. Returns the last active browser. | 41 // added to it. Returns the last active browser. |
| 39 // | 42 // |
| 40 // If |urls_to_open| is non-empty, a tab is added for each of the URLs. | 43 // If |urls_to_open| is non-empty, a tab is added for each of the URLs. |
| 41 static Browser* RestoreSession(Profile* profile, | 44 static Browser* RestoreSession(Profile* profile, |
| 42 Browser* browser, | 45 Browser* browser, |
| 43 uint32 behavior, | 46 uint32 behavior, |
| (...skipping 18 matching lines...) Expand all Loading... |
| 62 // a session. A value of 0 indicates all tabs are loaded at once. | 65 // a session. A value of 0 indicates all tabs are loaded at once. |
| 63 static size_t num_tabs_to_load_; | 66 static size_t num_tabs_to_load_; |
| 64 | 67 |
| 65 private: | 68 private: |
| 66 SessionRestore(); | 69 SessionRestore(); |
| 67 | 70 |
| 68 DISALLOW_COPY_AND_ASSIGN(SessionRestore); | 71 DISALLOW_COPY_AND_ASSIGN(SessionRestore); |
| 69 }; | 72 }; |
| 70 | 73 |
| 71 #endif // CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ | 74 #endif // CHROME_BROWSER_SESSIONS_SESSION_RESTORE_H_ |
| OLD | NEW |