| 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 #include "chrome/browser/sessions/session_restore.h" | 5 #include "chrome/browser/sessions/session_restore.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <list> | 8 #include <list> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "chrome/browser/sessions/session_service_factory.h" | 24 #include "chrome/browser/sessions/session_service_factory.h" |
| 25 #include "chrome/browser/sessions/session_types.h" | 25 #include "chrome/browser/sessions/session_types.h" |
| 26 #include "chrome/browser/tabs/tab_strip_model.h" | 26 #include "chrome/browser/tabs/tab_strip_model.h" |
| 27 #include "chrome/browser/ui/browser.h" | 27 #include "chrome/browser/ui/browser.h" |
| 28 #include "chrome/browser/ui/browser_list.h" | 28 #include "chrome/browser/ui/browser_list.h" |
| 29 #include "chrome/browser/ui/browser_navigator.h" | 29 #include "chrome/browser/ui/browser_navigator.h" |
| 30 #include "chrome/browser/ui/browser_window.h" | 30 #include "chrome/browser/ui/browser_window.h" |
| 31 #include "chrome/common/chrome_notification_types.h" | 31 #include "chrome/common/chrome_notification_types.h" |
| 32 #include "content/browser/renderer_host/render_widget_host.h" | 32 #include "content/browser/renderer_host/render_widget_host.h" |
| 33 #include "content/browser/renderer_host/render_widget_host_view.h" | 33 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 34 #include "content/browser/tab_contents/tab_contents.h" | |
| 35 #include "content/browser/tab_contents/tab_contents_view.h" | 34 #include "content/browser/tab_contents/tab_contents_view.h" |
| 36 #include "content/public/browser/navigation_controller.h" | 35 #include "content/public/browser/navigation_controller.h" |
| 37 #include "content/public/browser/notification_registrar.h" | 36 #include "content/public/browser/notification_registrar.h" |
| 38 #include "content/public/browser/notification_service.h" | 37 #include "content/public/browser/notification_service.h" |
| 38 #include "content/public/browser/web_contents.h" |
| 39 #include "net/base/network_change_notifier.h" | 39 #include "net/base/network_change_notifier.h" |
| 40 | 40 |
| 41 #if defined(OS_CHROMEOS) | 41 #if defined(OS_CHROMEOS) |
| 42 #include "chrome/browser/chromeos/boot_times_loader.h" | 42 #include "chrome/browser/chromeos/boot_times_loader.h" |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 using content::NavigationController; | 45 using content::NavigationController; |
| 46 using content::WebContents; | 46 using content::WebContents; |
| 47 | 47 |
| 48 // Are we in the process of restoring? | 48 // Are we in the process of restoring? |
| (...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 std::vector<GURL> gurls; | 900 std::vector<GURL> gurls; |
| 901 SessionRestoreImpl restorer(profile, | 901 SessionRestoreImpl restorer(profile, |
| 902 static_cast<Browser*>(NULL), true, false, true, gurls); | 902 static_cast<Browser*>(NULL), true, false, true, gurls); |
| 903 restorer.RestoreForeignTab(tab); | 903 restorer.RestoreForeignTab(tab); |
| 904 } | 904 } |
| 905 | 905 |
| 906 // static | 906 // static |
| 907 bool SessionRestore::IsRestoring() { | 907 bool SessionRestore::IsRestoring() { |
| 908 return restoring; | 908 return restoring; |
| 909 } | 909 } |
| OLD | NEW |