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

Unified Diff: chrome/browser/ui/media_utils.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed thestig@'s comments. Created 6 years, 1 month 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/media_utils.cc
diff --git a/chrome/browser/ui/media_utils.cc b/chrome/browser/ui/media_utils.cc
index 52d463377281ae737f208b65045eb4907c1504b8..4520a19c2e0d739e67e302e43d8aaeeac440d9e0 100644
--- a/chrome/browser/ui/media_utils.cc
+++ b/chrome/browser/ui/media_utils.cc
@@ -9,8 +9,7 @@
#include "content/public/browser/web_contents.h"
#if defined(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/extension_service.h"
-#include "extensions/browser/extension_system.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/common/constants.h"
#endif
@@ -22,10 +21,9 @@ const extensions::Extension* GetExtensionForOrigin(Profile* profile,
if (!security_origin.SchemeIs(extensions::kExtensionScheme))
return NULL;
- ExtensionService* extensions_service =
- extensions::ExtensionSystem::Get(profile)->extension_service();
const extensions::Extension* extension =
- extensions_service->extensions()->GetByID(security_origin.host());
+ extensions::ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(
+ security_origin.host());
DCHECK(extension);
return extension;
}
« no previous file with comments | « chrome/browser/ui/location_bar/origin_chip_info.cc ('k') | chrome/browser/ui/sync/profile_signin_confirmation_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698