Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: chrome/browser/sessions/session_restore.cc

Issue 218683011: Remove ExtensionService::[Get|Is]InstalledApp() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ces_get_installed_ext_by_url
Patch Set: Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sessions/session_restore.cc
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 585fec38b29d9454c76c257293de3e94eaa39edd..84624e886ed9cc6eec237f55b65c790fa8d1b210 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -23,7 +23,6 @@
#include "base/task/cancelable_task_tracker.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/performance_monitor/startup_timer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sessions/session_service.h"
@@ -49,6 +48,8 @@
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_view.h"
+#include "extensions/browser/extension_registry.h"
+#include "extensions/common/extension_set.h"
#include "net/base/network_change_notifier.h"
#if defined(OS_CHROMEOS)
@@ -955,14 +956,13 @@ class SessionRestoreImpl : public content::NotificationObserver {
DCHECK(selected_index >= 0 &&
selected_index < static_cast<int>(tab.navigations.size()));
GURL url = tab.navigations[selected_index].virtual_url();
- if (browser->profile()->GetExtensionService()) {
- const extensions::Extension* extension =
- browser->profile()->GetExtensionService()->GetInstalledApp(url);
- if (extension) {
- CoreAppLauncherHandler::RecordAppLaunchType(
- extension_misc::APP_LAUNCH_SESSION_RESTORE,
- extension->GetType());
- }
+ const extensions::Extension* extension =
+ extensions::ExtensionRegistry::Get(profile())
+ ->enabled_extensions().GetAppByURL(url);
+ if (extension) {
+ CoreAppLauncherHandler::RecordAppLaunchType(
+ extension_misc::APP_LAUNCH_SESSION_RESTORE,
+ extension->GetType());
}
}
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/sessions/tab_restore_service_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698