| 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 #include "chrome/browser/sessions/session_restore.h" | 5 #include "chrome/browser/sessions/session_restore.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <list> | 10 #include <list> |
| (...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 709 | 709 |
| 710 // Set of URLs to open in addition to those restored from the session. | 710 // Set of URLs to open in addition to those restored from the session. |
| 711 std::vector<GURL> urls_to_open_; | 711 std::vector<GURL> urls_to_open_; |
| 712 | 712 |
| 713 // Used to get the session. | 713 // Used to get the session. |
| 714 base::CancelableTaskTracker cancelable_task_tracker_; | 714 base::CancelableTaskTracker cancelable_task_tracker_; |
| 715 | 715 |
| 716 // Responsible for loading the tabs. | 716 // Responsible for loading the tabs. |
| 717 scoped_refptr<TabLoader> tab_loader_; | 717 scoped_refptr<TabLoader> tab_loader_; |
| 718 | 718 |
| 719 // When synchronous we run a nested message loop. To avoid creating windows | 719 // When synchronous we run a nested run loop. To avoid creating windows |
| 720 // from the nested message loop (which can make exiting the nested message | 720 // from the nested run loop (which can make exiting the nested message |
| 721 // loop take a while) we cache the SessionWindows here and create the actual | 721 // loop take a while) we cache the SessionWindows here and create the actual |
| 722 // windows when the nested message loop exits. | 722 // windows when the nested run loop exits. |
| 723 std::vector<std::unique_ptr<sessions::SessionWindow>> windows_; | 723 std::vector<std::unique_ptr<sessions::SessionWindow>> windows_; |
| 724 SessionID::id_type active_window_id_; | 724 SessionID::id_type active_window_id_; |
| 725 | 725 |
| 726 content::NotificationRegistrar registrar_; | 726 content::NotificationRegistrar registrar_; |
| 727 | 727 |
| 728 // When asynchronous it's possible for there to be no windows. To make sure | 728 // When asynchronous it's possible for there to be no windows. To make sure |
| 729 // Chrome doesn't prematurely exit we register a KeepAlive for the lifetime | 729 // Chrome doesn't prematurely exit we register a KeepAlive for the lifetime |
| 730 // of this object. | 730 // of this object. |
| 731 std::unique_ptr<ScopedKeepAlive> keep_alive_; | 731 std::unique_ptr<ScopedKeepAlive> keep_alive_; |
| 732 | 732 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 843 // static | 843 // static |
| 844 SessionRestore::CallbackSubscription | 844 SessionRestore::CallbackSubscription |
| 845 SessionRestore::RegisterOnSessionRestoredCallback( | 845 SessionRestore::RegisterOnSessionRestoredCallback( |
| 846 const base::Callback<void(int)>& callback) { | 846 const base::Callback<void(int)>& callback) { |
| 847 return on_session_restored_callbacks()->Add(callback); | 847 return on_session_restored_callbacks()->Add(callback); |
| 848 } | 848 } |
| 849 | 849 |
| 850 // static | 850 // static |
| 851 base::CallbackList<void(int)>* | 851 base::CallbackList<void(int)>* |
| 852 SessionRestore::on_session_restored_callbacks_ = nullptr; | 852 SessionRestore::on_session_restored_callbacks_ = nullptr; |
| OLD | NEW |