OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_service.h" | 5 #include "chrome/browser/sessions/session_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 29 matching lines...) Expand all Loading... |
40 #include "components/sessions/core/session_constants.h" | 40 #include "components/sessions/core/session_constants.h" |
41 #include "components/sessions/session_command.h" | 41 #include "components/sessions/session_command.h" |
42 #include "components/sessions/session_types.h" | 42 #include "components/sessions/session_types.h" |
43 #include "content/public/browser/navigation_details.h" | 43 #include "content/public/browser/navigation_details.h" |
44 #include "content/public/browser/navigation_entry.h" | 44 #include "content/public/browser/navigation_entry.h" |
45 #include "content/public/browser/notification_details.h" | 45 #include "content/public/browser/notification_details.h" |
46 #include "content/public/browser/notification_service.h" | 46 #include "content/public/browser/notification_service.h" |
47 #include "content/public/browser/session_storage_namespace.h" | 47 #include "content/public/browser/session_storage_namespace.h" |
48 #include "content/public/browser/web_contents.h" | 48 #include "content/public/browser/web_contents.h" |
49 #include "extensions/common/extension.h" | 49 #include "extensions/common/extension.h" |
| 50 #include "ui/gfx/host_desktop_type.h" |
50 | 51 |
51 #if defined(OS_MACOSX) | 52 #if defined(OS_MACOSX) |
52 #include "chrome/browser/app_controller_mac.h" | 53 #include "chrome/browser/app_controller_mac.h" |
53 #endif | 54 #endif |
54 | 55 |
55 using base::Time; | 56 using base::Time; |
56 using content::NavigationEntry; | 57 using content::NavigationEntry; |
57 using content::WebContents; | 58 using content::WebContents; |
58 using sessions::ContentSerializedNavigationBuilder; | 59 using sessions::ContentSerializedNavigationBuilder; |
59 using sessions::SerializedNavigationEntry; | 60 using sessions::SerializedNavigationEntry; |
(...skipping 1056 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1116 for (chrome::BrowserIterator it; !it.done(); it.Next()) { | 1117 for (chrome::BrowserIterator it; !it.done(); it.Next()) { |
1117 if ((*it)->profile() == profile()) | 1118 if ((*it)->profile() == profile()) |
1118 return; | 1119 return; |
1119 } | 1120 } |
1120 DeleteSessionOnlyData(profile()); | 1121 DeleteSessionOnlyData(profile()); |
1121 } | 1122 } |
1122 | 1123 |
1123 sessions::BaseSessionService* SessionService::GetBaseSessionServiceForTest() { | 1124 sessions::BaseSessionService* SessionService::GetBaseSessionServiceForTest() { |
1124 return base_session_service_.get(); | 1125 return base_session_service_.get(); |
1125 } | 1126 } |
OLD | NEW |