| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 664 const SerializedNavigationEntry navigation = | 664 const SerializedNavigationEntry navigation = |
| 665 ContentSerializedNavigationBuilder::FromNavigationEntry( | 665 ContentSerializedNavigationBuilder::FromNavigationEntry( |
| 666 current_entry_index, | 666 current_entry_index, |
| 667 *web_contents->GetController().GetEntryAtIndex( | 667 *web_contents->GetController().GetEntryAtIndex( |
| 668 current_entry_index)); | 668 current_entry_index)); |
| 669 UpdateTabNavigation( | 669 UpdateTabNavigation( |
| 670 session_tab_helper->window_id(), | 670 session_tab_helper->window_id(), |
| 671 session_tab_helper->session_id(), | 671 session_tab_helper->session_id(), |
| 672 navigation); | 672 navigation); |
| 673 content::Details<content::LoadCommittedDetails> changed(details); | 673 content::Details<content::LoadCommittedDetails> changed(details); |
| 674 if (changed->type == content::NAVIGATION_TYPE_NEW_PAGE || | 674 if (changed->type == content::NavigationType::NEW_PAGE || |
| 675 changed->type == content::NAVIGATION_TYPE_EXISTING_PAGE) { | 675 changed->type == content::NavigationType::EXISTING_PAGE) { |
| 676 RecordSessionUpdateHistogramData(type, | 676 RecordSessionUpdateHistogramData(type, |
| 677 &last_updated_nav_entry_commit_time_); | 677 &last_updated_nav_entry_commit_time_); |
| 678 } | 678 } |
| 679 break; | 679 break; |
| 680 } | 680 } |
| 681 | 681 |
| 682 case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: { | 682 case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: { |
| 683 extensions::TabHelper* extension_tab_helper = | 683 extensions::TabHelper* extension_tab_helper = |
| 684 content::Source<extensions::TabHelper>(source).ptr(); | 684 content::Source<extensions::TabHelper>(source).ptr(); |
| 685 if (extension_tab_helper->web_contents()->GetBrowserContext() != | 685 if (extension_tab_helper->web_contents()->GetBrowserContext() != |
| (...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1096 for (auto* browser : *BrowserList::GetInstance()) { | 1096 for (auto* browser : *BrowserList::GetInstance()) { |
| 1097 if (browser->profile() == profile()) | 1097 if (browser->profile() == profile()) |
| 1098 return; | 1098 return; |
| 1099 } | 1099 } |
| 1100 DeleteSessionOnlyData(profile()); | 1100 DeleteSessionOnlyData(profile()); |
| 1101 } | 1101 } |
| 1102 | 1102 |
| 1103 sessions::BaseSessionService* SessionService::GetBaseSessionServiceForTest() { | 1103 sessions::BaseSessionService* SessionService::GetBaseSessionServiceForTest() { |
| 1104 return base_session_service_.get(); | 1104 return base_session_service_.get(); |
| 1105 } | 1105 } |
| OLD | NEW |