| 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/tab_restore_service_helper.h" | 5 #include "chrome/browser/sessions/tab_restore_service_helper.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/extensions/tab_helper.h" | 14 #include "chrome/browser/extensions/tab_helper.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/sessions/session_types.h" | 16 #include "chrome/browser/sessions/session_types.h" |
| 17 #include "chrome/browser/sessions/tab_restore_service_delegate.h" | 17 #include "chrome/browser/sessions/tab_restore_service_delegate.h" |
| 18 #include "chrome/browser/sessions/tab_restore_service_observer.h" | 18 #include "chrome/browser/sessions/tab_restore_service_observer.h" |
| 19 #include "chrome/common/extensions/extension.h" | |
| 20 #include "chrome/common/extensions/extension_constants.h" | 19 #include "chrome/common/extensions/extension_constants.h" |
| 21 #include "chrome/common/url_constants.h" | 20 #include "chrome/common/url_constants.h" |
| 22 #include "content/public/browser/navigation_controller.h" | 21 #include "content/public/browser/navigation_controller.h" |
| 23 #include "content/public/browser/navigation_entry.h" | 22 #include "content/public/browser/navigation_entry.h" |
| 23 #include "content/public/browser/session_storage_namespace.h" |
| 24 #include "content/public/browser/web_contents.h" | 24 #include "content/public/browser/web_contents.h" |
| 25 #include "content/public/browser/session_storage_namespace.h" | 25 #include "extensions/common/extension.h" |
| 26 | 26 |
| 27 #if !defined(OS_ANDROID) | 27 #if !defined(OS_ANDROID) |
| 28 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" | 28 #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 using content::NavigationController; | 31 using content::NavigationController; |
| 32 using content::NavigationEntry; | 32 using content::NavigationEntry; |
| 33 using content::WebContents; | 33 using content::WebContents; |
| 34 | 34 |
| 35 namespace { | 35 namespace { |
| (...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 Tab* tab = static_cast<Tab*>(entry); | 586 Tab* tab = static_cast<Tab*>(entry); |
| 587 if (tab->browser_id == old_id) | 587 if (tab->browser_id == old_id) |
| 588 tab->browser_id = new_id; | 588 tab->browser_id = new_id; |
| 589 } | 589 } |
| 590 } | 590 } |
| 591 } | 591 } |
| 592 | 592 |
| 593 base::Time TabRestoreServiceHelper::TimeNow() const { | 593 base::Time TabRestoreServiceHelper::TimeNow() const { |
| 594 return time_factory_ ? time_factory_->TimeNow() : base::Time::Now(); | 594 return time_factory_ ? time_factory_->TimeNow() : base::Time::Now(); |
| 595 } | 595 } |
| OLD | NEW |