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

Unified Diff: chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.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/fullscreen/fullscreen_exit_bubble_type.cc
diff --git a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
index 36c0949c554623b1a6fb7ec1f416dacda4ec51ea..0c8c076aa20639a44e42e15f5588491873b47f9e 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.cc
@@ -5,9 +5,9 @@
#include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_service.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
+#include "extensions/browser/extension_registry.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"
@@ -17,14 +17,11 @@ namespace fullscreen_bubble {
base::string16 GetLabelTextForType(FullscreenExitBubbleType type,
const GURL& url,
- ExtensionService* extension_service) {
+ extensions::ExtensionRegistry* registry) {
base::string16 host(base::UTF8ToUTF16(url.host()));
- if (extension_service) {
- const extensions::ExtensionSet* extensions =
- extension_service->extensions();
- DCHECK(extensions);
+ if (registry) {
const extensions::Extension* extension =
- extensions->GetExtensionOrAppByURL(url);
+ registry->enabled_extensions().GetExtensionOrAppByURL(url);
if (extension) {
host = base::UTF8ToUTF16(extension->name());
} else if (url.SchemeIs(extensions::kExtensionScheme)) {
« no previous file with comments | « chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h ('k') | chrome/browser/ui/location_bar/origin_chip_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698