| 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 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 RecordSessionUpdateHistogramData( | 673 RecordSessionUpdateHistogramData( |
| 674 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 674 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 675 &last_updated_nav_entry_commit_time_); | 675 &last_updated_nav_entry_commit_time_); |
| 676 } | 676 } |
| 677 break; | 677 break; |
| 678 } | 678 } |
| 679 | 679 |
| 680 case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: { | 680 case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: { |
| 681 ExtensionTabHelper* extension_tab_helper = | 681 ExtensionTabHelper* extension_tab_helper = |
| 682 content::Source<ExtensionTabHelper>(source).ptr(); | 682 content::Source<ExtensionTabHelper>(source).ptr(); |
| 683 if (extension_tab_helper->tab_contents_wrapper()->profile() != profile()) | 683 if (extension_tab_helper->tab_contents()->profile() != profile()) |
| 684 return; | 684 return; |
| 685 if (extension_tab_helper->extension_app()) { | 685 if (extension_tab_helper->extension_app()) { |
| 686 RestoreTabHelper* helper = | 686 RestoreTabHelper* helper = |
| 687 extension_tab_helper->tab_contents_wrapper()->restore_tab_helper(); | 687 extension_tab_helper->tab_contents()->restore_tab_helper(); |
| 688 SetTabExtensionAppID(helper->window_id(), | 688 SetTabExtensionAppID(helper->window_id(), |
| 689 helper->session_id(), | 689 helper->session_id(), |
| 690 extension_tab_helper->extension_app()->id()); | 690 extension_tab_helper->extension_app()->id()); |
| 691 } | 691 } |
| 692 break; | 692 break; |
| 693 } | 693 } |
| 694 | 694 |
| 695 default: | 695 default: |
| 696 NOTREACHED(); | 696 NOTREACHED(); |
| 697 } | 697 } |
| (...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1678 50); | 1678 50); |
| 1679 if (use_long_period) { | 1679 if (use_long_period) { |
| 1680 std::string long_name_("SessionRestore.SaveLongPeriod"); | 1680 std::string long_name_("SessionRestore.SaveLongPeriod"); |
| 1681 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, | 1681 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, |
| 1682 delta, | 1682 delta, |
| 1683 save_delay_in_mins_, | 1683 save_delay_in_mins_, |
| 1684 save_delay_in_hrs_, | 1684 save_delay_in_hrs_, |
| 1685 50); | 1685 50); |
| 1686 } | 1686 } |
| 1687 } | 1687 } |
| OLD | NEW |