| 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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 RecordSessionUpdateHistogramData( | 678 RecordSessionUpdateHistogramData( |
| 679 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 679 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 680 &last_updated_nav_entry_commit_time_); | 680 &last_updated_nav_entry_commit_time_); |
| 681 } | 681 } |
| 682 break; | 682 break; |
| 683 } | 683 } |
| 684 | 684 |
| 685 case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: { | 685 case chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED: { |
| 686 ExtensionTabHelper* extension_tab_helper = | 686 ExtensionTabHelper* extension_tab_helper = |
| 687 content::Source<ExtensionTabHelper>(source).ptr(); | 687 content::Source<ExtensionTabHelper>(source).ptr(); |
| 688 if (extension_tab_helper->tab_contents_wrapper()->profile() != profile()) | 688 if (extension_tab_helper->tab_contents()->profile() != profile()) |
| 689 return; | 689 return; |
| 690 if (extension_tab_helper->extension_app()) { | 690 if (extension_tab_helper->extension_app()) { |
| 691 RestoreTabHelper* helper = | 691 RestoreTabHelper* helper = |
| 692 extension_tab_helper->tab_contents_wrapper()->restore_tab_helper(); | 692 extension_tab_helper->tab_contents()->restore_tab_helper(); |
| 693 SetTabExtensionAppID(helper->window_id(), | 693 SetTabExtensionAppID(helper->window_id(), |
| 694 helper->session_id(), | 694 helper->session_id(), |
| 695 extension_tab_helper->extension_app()->id()); | 695 extension_tab_helper->extension_app()->id()); |
| 696 } | 696 } |
| 697 break; | 697 break; |
| 698 } | 698 } |
| 699 | 699 |
| 700 default: | 700 default: |
| 701 NOTREACHED(); | 701 NOTREACHED(); |
| 702 } | 702 } |
| (...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1685 50); | 1685 50); |
| 1686 if (use_long_period) { | 1686 if (use_long_period) { |
| 1687 std::string long_name_("SessionRestore.SaveLongPeriod"); | 1687 std::string long_name_("SessionRestore.SaveLongPeriod"); |
| 1688 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, | 1688 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, |
| 1689 delta, | 1689 delta, |
| 1690 save_delay_in_mins_, | 1690 save_delay_in_mins_, |
| 1691 save_delay_in_hrs_, | 1691 save_delay_in_hrs_, |
| 1692 50); | 1692 50); |
| 1693 } | 1693 } |
| 1694 } | 1694 } |
| OLD | NEW |