| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
| 12 #include "base/stl_util-inl.h" | 12 #include "base/stl_util-inl.h" |
| 13 #include "base/string_util.h" | 13 #include "base/string_util.h" |
| 14 #include "chrome/browser/browser.h" | |
| 15 #include "chrome/browser/browser_list.h" | |
| 16 #include "chrome/browser/browser_process.h" | 14 #include "chrome/browser/browser_process.h" |
| 17 #include "chrome/browser/browser_window.h" | |
| 18 #include "chrome/browser/extensions/extensions_service.h" | 15 #include "chrome/browser/extensions/extensions_service.h" |
| 19 #include "chrome/browser/profile.h" | 16 #include "chrome/browser/profile.h" |
| 20 #include "chrome/browser/sessions/session_service.h" | 17 #include "chrome/browser/sessions/session_service.h" |
| 21 #include "chrome/browser/sessions/session_types.h" | 18 #include "chrome/browser/sessions/session_types.h" |
| 22 #include "chrome/browser/tab_contents/navigation_controller.h" | 19 #include "chrome/browser/tab_contents/navigation_controller.h" |
| 23 #include "chrome/browser/tab_contents/tab_contents.h" | 20 #include "chrome/browser/tab_contents/tab_contents.h" |
| 24 #include "chrome/browser/tab_contents/tab_contents_view.h" | 21 #include "chrome/browser/tab_contents/tab_contents_view.h" |
| 25 #include "chrome/browser/tabs/tab_strip_model.h" | 22 #include "chrome/browser/tabs/tab_strip_model.h" |
| 23 #include "chrome/browser/ui/browser.h" |
| 24 #include "chrome/browser/ui/browser_list.h" |
| 26 #include "chrome/browser/ui/browser_navigator.h" | 25 #include "chrome/browser/ui/browser_navigator.h" |
| 26 #include "chrome/browser/ui/browser_window.h" |
| 27 #include "chrome/common/chrome_switches.h" | 27 #include "chrome/common/chrome_switches.h" |
| 28 #include "chrome/common/notification_registrar.h" | 28 #include "chrome/common/notification_registrar.h" |
| 29 #include "chrome/common/notification_service.h" | 29 #include "chrome/common/notification_service.h" |
| 30 | 30 |
| 31 #if defined(OS_CHROMEOS) | 31 #if defined(OS_CHROMEOS) |
| 32 #include "chrome/browser/chromeos/boot_times_loader.h" | 32 #include "chrome/browser/chromeos/boot_times_loader.h" |
| 33 #include "chrome/browser/chromeos/network_state_notifier.h" | 33 #include "chrome/browser/chromeos/network_state_notifier.h" |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 // Are we in the process of restoring? | 36 // Are we in the process of restoring? |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 void SessionRestore::RestoreSessionSynchronously( | 664 void SessionRestore::RestoreSessionSynchronously( |
| 665 Profile* profile, | 665 Profile* profile, |
| 666 const std::vector<GURL>& urls_to_open) { | 666 const std::vector<GURL>& urls_to_open) { |
| 667 Restore(profile, NULL, true, false, true, urls_to_open); | 667 Restore(profile, NULL, true, false, true, urls_to_open); |
| 668 } | 668 } |
| 669 | 669 |
| 670 // static | 670 // static |
| 671 bool SessionRestore::IsRestoring() { | 671 bool SessionRestore::IsRestoring() { |
| 672 return restoring; | 672 return restoring; |
| 673 } | 673 } |
| OLD | NEW |