chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc - Issue 218683011: Remove ExtensionService::[Get|Is]InstalledApp()

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/extensions/api/sync_file_system/extension_sync_event_observer.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: Latest master Created 6 years, 9 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

« no previous file with comments | « chrome/browser/chromeos/first_run/drive_first_run_controller.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | chrome/browser/ui/ash/launcher/launcher_app_tab_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc

diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc

index 5323dc6a0ee0fde154241bbca7f2919735b8e347..6f7693b414f58c0198f14d14b52d9aec9e6fa180 100644

--- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc

+++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc

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

#include "base/lazy_instance.h"

#include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h"

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

#include "chrome/browser/sync_file_system/sync_event_observer.h"

#include "chrome/browser/sync_file_system/sync_file_system_service.h"

#include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"

@@ -14,9 +13,11 @@

#include "chrome/common/extensions/api/sync_file_system.h"

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

#include "extensions/browser/event_router.h"

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

#include "extensions/browser/extension_system.h"

#include "extensions/browser/extension_system_provider.h"

#include "extensions/browser/extensions_browser_client.h"

+#include "extensions/common/extension_set.h"

#include "webkit/browser/fileapi/file_system_url.h"

#include "webkit/common/fileapi/file_system_util.h"

@@ -58,9 +59,8 @@ void ExtensionSyncEventObserver::Shutdown() {

std::string ExtensionSyncEventObserver::GetExtensionId(

const GURL& app_origin) {

- const Extension* app = ExtensionSystem::Get(browser_context_)

- ->extension_service()

- ->GetInstalledApp(app_origin);

+ const Extension* app = ExtensionRegistry::Get(browser_context_)

+ ->enabled_extensions().GetAppByURL(app_origin);

if (!app) {

// The app is uninstalled or disabled.

return std::string();