| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <limits> | 8 #include <limits> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 462 NotificationService::AllSources()); | 462 NotificationService::AllSources()); |
| 463 registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED, | 463 registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED, |
| 464 NotificationService::AllSources()); | 464 NotificationService::AllSources()); |
| 465 registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED, | 465 registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED, |
| 466 NotificationService::AllSources()); | 466 NotificationService::AllSources()); |
| 467 registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED, | 467 registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_CHANGED, |
| 468 NotificationService::AllSources()); | 468 NotificationService::AllSources()); |
| 469 registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 469 registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 470 NotificationService::AllSources()); | 470 NotificationService::AllSources()); |
| 471 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_OPENED, | 471 registrar_.Add(this, chrome::NOTIFICATION_BROWSER_OPENED, |
| 472 NotificationService::AllSources()); | 472 NotificationService::AllBrowserContextsAndSources()); |
| 473 registrar_.Add( | 473 registrar_.Add( |
| 474 this, chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED, | 474 this, chrome::NOTIFICATION_TAB_CONTENTS_APPLICATION_EXTENSION_CHANGED, |
| 475 NotificationService::AllSources()); | 475 NotificationService::AllSources()); |
| 476 } | 476 } |
| 477 | 477 |
| 478 bool SessionService::RestoreIfNecessary(const std::vector<GURL>& urls_to_open, | 478 bool SessionService::RestoreIfNecessary(const std::vector<GURL>& urls_to_open, |
| 479 Browser* browser) { | 479 Browser* browser) { |
| 480 if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup() && | 480 if (!has_open_trackable_browsers_ && !BrowserInit::InProcessStartup() && |
| 481 !SessionRestore::IsRestoring() | 481 !SessionRestore::IsRestoring() |
| 482 #if defined(OS_MACOSX) | 482 #if defined(OS_MACOSX) |
| (...skipping 993 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1476 50); | 1476 50); |
| 1477 if (use_long_period) { | 1477 if (use_long_period) { |
| 1478 std::string long_name_("SessionRestore.SaveLongPeriod"); | 1478 std::string long_name_("SessionRestore.SaveLongPeriod"); |
| 1479 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, | 1479 UMA_HISTOGRAM_CUSTOM_TIMES(long_name_, |
| 1480 delta, | 1480 delta, |
| 1481 save_delay_in_mins_, | 1481 save_delay_in_mins_, |
| 1482 save_delay_in_hrs_, | 1482 save_delay_in_hrs_, |
| 1483 50); | 1483 50); |
| 1484 } | 1484 } |
| 1485 } | 1485 } |
| OLD | NEW |