| 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 "base/file_util.h" | 5 #include "base/file_util.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
| 8 #include "base/scoped_vector.h" | 8 #include "base/scoped_vector.h" |
| 9 #include "base/stl_util-inl.h" | 9 #include "base/stl_util-inl.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| 11 #include "base/time.h" | 11 #include "base/time.h" |
| 12 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/browser/defaults.h" | 13 #include "chrome/browser/defaults.h" |
| 13 #include "chrome/browser/sessions/session_backend.h" | 14 #include "chrome/browser/sessions/session_backend.h" |
| 14 #include "chrome/browser/sessions/session_service.h" | 15 #include "chrome/browser/sessions/session_service.h" |
| 15 #include "chrome/browser/sessions/session_service_test_helper.h" | 16 #include "chrome/browser/sessions/session_service_test_helper.h" |
| 16 #include "chrome/browser/sessions/session_types.h" | 17 #include "chrome/browser/sessions/session_types.h" |
| 17 #include "chrome/browser/tab_contents/navigation_entry.h" | 18 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 18 #include "chrome/common/chrome_paths.h" | 19 #include "chrome/common/chrome_paths.h" |
| 19 #include "chrome/common/notification_observer.h" | 20 #include "chrome/common/notification_observer.h" |
| 20 #include "chrome/common/notification_registrar.h" | 21 #include "chrome/common/notification_registrar.h" |
| 21 #include "chrome/common/notification_service.h" | 22 #include "chrome/common/notification_service.h" |
| (...skipping 631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 653 | 654 |
| 654 helper_.PrepareTabInWindow(window_id, tab_id, 0, true); | 655 helper_.PrepareTabInWindow(window_id, tab_id, 0, true); |
| 655 UpdateNavigation(window_id, tab_id, nav1, 0, true); | 656 UpdateNavigation(window_id, tab_id, nav1, 0, true); |
| 656 service()->TabClosed(window_id, tab_id, true); | 657 service()->TabClosed(window_id, tab_id, true); |
| 657 | 658 |
| 658 ScopedVector<SessionWindow> windows; | 659 ScopedVector<SessionWindow> windows; |
| 659 ReadWindows(&(windows.get())); | 660 ReadWindows(&(windows.get())); |
| 660 | 661 |
| 661 ASSERT_TRUE(windows->empty()); | 662 ASSERT_TRUE(windows->empty()); |
| 662 } | 663 } |
| OLD | NEW |