chrome/browser/ui/views/location_bar/origin_chip_view.cc - Issue 709813004: Remove the deprecated function ExtensionService::extensions().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/origin_chip_view.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

« no previous file with comments | « chrome/browser/ui/sync/profile_signin_confirmation_helper.cc ('k') | chrome/browser/ui/webui/extensions/extension_info_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/origin_chip_view.cc

diff --git a/chrome/browser/ui/views/location_bar/origin_chip_view.cc b/chrome/browser/ui/views/location_bar/origin_chip_view.cc

index 5ee0eed17ea8fda6e1b11d6bb18feb54276be154..1100065f1e5c93f2121566ee5436ab802668f79a 100644

--- a/chrome/browser/ui/views/location_bar/origin_chip_view.cc

+++ b/chrome/browser/ui/views/location_bar/origin_chip_view.cc

@@ -9,7 +9,6 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/browser_process.h"

-#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_util.h"

#include "chrome/browser/favicon/favicon_tab_helper.h"

#include "chrome/browser/profiles/profile.h"

@@ -28,7 +27,7 @@

#include "content/public/browser/web_contents.h"

#include "content/public/common/url_constants.h"

#include "extensions/browser/extension_icon_image.h"

-#include "extensions/browser/extension_system.h"

+#include "extensions/browser/extension_registry.h"

#include "extensions/common/constants.h"

#include "extensions/common/manifest_handlers/icons_handler.h"

#include "grit/theme_resources.h"

@@ -127,9 +126,9 @@ const int kEVImages[3][9] = {

const extensions::Extension* GetExtension(const GURL& url, Profile* profile) {

if (!url.SchemeIs(extensions::kExtensionScheme))

return NULL;

- ExtensionService* service =

- extensions::ExtensionSystem::Get(profile)->extension_service();

- return service->extensions()->GetExtensionOrAppByURL(url);

+ extensions::ExtensionRegistry* registry =

+ extensions::ExtensionRegistry::Get(profile);

+ return registry->enabled_extensions().GetByID(url.host());

}

} // namespace