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 <algorithm> |
| 8 #include <list> |
| 9 #include <set> |
7 #include <vector> | 10 #include <vector> |
8 | 11 |
9 #include "base/callback.h" | 12 #include "base/callback.h" |
10 #include "base/command_line.h" | 13 #include "base/command_line.h" |
11 #include "base/scoped_ptr.h" | 14 #include "base/scoped_ptr.h" |
12 #include "base/stl_util-inl.h" | 15 #include "base/stl_util-inl.h" |
13 #include "base/string_util.h" | 16 #include "base/string_util.h" |
14 #include "chrome/browser/browser_process.h" | |
15 #include "chrome/browser/extensions/extensions_service.h" | 17 #include "chrome/browser/extensions/extensions_service.h" |
16 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/sessions/session_service.h" | 19 #include "chrome/browser/sessions/session_service.h" |
18 #include "chrome/browser/sessions/session_types.h" | 20 #include "chrome/browser/sessions/session_types.h" |
19 #include "chrome/browser/tab_contents/navigation_controller.h" | 21 #include "chrome/browser/tab_contents/navigation_controller.h" |
20 #include "chrome/browser/tab_contents/tab_contents.h" | 22 #include "chrome/browser/tab_contents/tab_contents.h" |
21 #include "chrome/browser/tab_contents/tab_contents_view.h" | 23 #include "chrome/browser/tab_contents/tab_contents_view.h" |
22 #include "chrome/browser/tabs/tab_strip_model.h" | 24 #include "chrome/browser/tabs/tab_strip_model.h" |
23 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
24 #include "chrome/browser/ui/browser_list.h" | 26 #include "chrome/browser/ui/browser_list.h" |
(...skipping 587 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 void SessionRestore::RestoreSessionSynchronously( | 614 void SessionRestore::RestoreSessionSynchronously( |
613 Profile* profile, | 615 Profile* profile, |
614 const std::vector<GURL>& urls_to_open) { | 616 const std::vector<GURL>& urls_to_open) { |
615 Restore(profile, NULL, true, false, true, urls_to_open); | 617 Restore(profile, NULL, true, false, true, urls_to_open); |
616 } | 618 } |
617 | 619 |
618 // static | 620 // static |
619 bool SessionRestore::IsRestoring() { | 621 bool SessionRestore::IsRestoring() { |
620 return restoring; | 622 return restoring; |
621 } | 623 } |
OLD | NEW |