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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.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/ui/startup/startup_browser_creator_impl.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index b436bb63aee7957c25e54217a2438fdb48ee09e9..20f4fa188659c6ed1864a9b1f39ce9d3d60cc6f6 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -92,6 +92,8 @@
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/constants.h"
+#include "extensions/common/extension.h"
+#include "extensions/common/extension_set.h"
#include "grit/locale_settings.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -228,11 +230,11 @@ void RecordCmdLineAppHistogram(extensions::Manifest::Type app_type) {
void RecordAppLaunches(Profile* profile,
const std::vector<GURL>& cmd_line_urls,
StartupTabs& autolaunch_tabs) {
- ExtensionService* extension_service = profile->GetExtensionService();
- DCHECK(extension_service);
+ const extensions::ExtensionSet& extensions =
+ extensions::ExtensionRegistry::Get(profile)->enabled_extensions();
for (size_t i = 0; i < cmd_line_urls.size(); ++i) {
const extensions::Extension* extension =
- extension_service->GetInstalledApp(cmd_line_urls.at(i));
+ extensions.GetAppByURL(cmd_line_urls.at(i));
if (extension) {
CoreAppLauncherHandler::RecordAppLaunchType(
extension_misc::APP_LAUNCH_CMD_LINE_URL,
@@ -241,7 +243,7 @@ void RecordAppLaunches(Profile* profile,
}
for (size_t i = 0; i < autolaunch_tabs.size(); ++i) {
const extensions::Extension* extension =
- extension_service->GetInstalledApp(autolaunch_tabs.at(i).url);
+ extensions.GetAppByURL(autolaunch_tabs.at(i).url);
if (extension) {
CoreAppLauncherHandler::RecordAppLaunchType(
extension_misc::APP_LAUNCH_AUTOLAUNCH,
@@ -513,7 +515,8 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(
if (policy->IsWebSafeScheme(url.scheme()) ||
url.SchemeIs(content::kFileScheme)) {
const extensions::Extension* extension =
- profile->GetExtensionService()->GetInstalledApp(url);
+ extensions::ExtensionRegistry::Get(profile)
+ ->enabled_extensions().GetAppByURL(url);
if (extension) {
RecordCmdLineAppHistogram(extension->GetType());
} else {
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698