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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server.h" 5 #include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_ob server.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h" 8 #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_he lpers.h"
9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/sync_file_system/sync_event_observer.h" 9 #include "chrome/browser/sync_file_system/sync_event_observer.h"
11 #include "chrome/browser/sync_file_system/sync_file_system_service.h" 10 #include "chrome/browser/sync_file_system/sync_file_system_service.h"
12 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h" 11 #include "chrome/browser/sync_file_system/sync_file_system_service_factory.h"
13 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 12 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
14 #include "chrome/common/extensions/api/sync_file_system.h" 13 #include "chrome/common/extensions/api/sync_file_system.h"
15 #include "content/public/browser/browser_context.h" 14 #include "content/public/browser/browser_context.h"
16 #include "extensions/browser/event_router.h" 15 #include "extensions/browser/event_router.h"
16 #include "extensions/browser/extension_registry.h"
17 #include "extensions/browser/extension_system.h" 17 #include "extensions/browser/extension_system.h"
18 #include "extensions/browser/extension_system_provider.h" 18 #include "extensions/browser/extension_system_provider.h"
19 #include "extensions/browser/extensions_browser_client.h" 19 #include "extensions/browser/extensions_browser_client.h"
20 #include "extensions/common/extension_set.h"
20 #include "webkit/browser/fileapi/file_system_url.h" 21 #include "webkit/browser/fileapi/file_system_url.h"
21 #include "webkit/common/fileapi/file_system_util.h" 22 #include "webkit/common/fileapi/file_system_util.h"
22 23
23 using sync_file_system::SyncEventObserver; 24 using sync_file_system::SyncEventObserver;
24 25
25 namespace extensions { 26 namespace extensions {
26 27
27 static base::LazyInstance< 28 static base::LazyInstance<
28 BrowserContextKeyedAPIFactory<ExtensionSyncEventObserver> > g_factory = 29 BrowserContextKeyedAPIFactory<ExtensionSyncEventObserver> > g_factory =
29 LAZY_INSTANCE_INITIALIZER; 30 LAZY_INSTANCE_INITIALIZER;
(...skipping 21 matching lines...) Expand all
51 52
52 ExtensionSyncEventObserver::~ExtensionSyncEventObserver() {} 53 ExtensionSyncEventObserver::~ExtensionSyncEventObserver() {}
53 54
54 void ExtensionSyncEventObserver::Shutdown() { 55 void ExtensionSyncEventObserver::Shutdown() {
55 if (sync_service_ != NULL) 56 if (sync_service_ != NULL)
56 sync_service_->RemoveSyncEventObserver(this); 57 sync_service_->RemoveSyncEventObserver(this);
57 } 58 }
58 59
59 std::string ExtensionSyncEventObserver::GetExtensionId( 60 std::string ExtensionSyncEventObserver::GetExtensionId(
60 const GURL& app_origin) { 61 const GURL& app_origin) {
61 const Extension* app = ExtensionSystem::Get(browser_context_) 62 const Extension* app = ExtensionRegistry::Get(browser_context_)
62 ->extension_service() 63 ->enabled_extensions().GetAppByURL(app_origin);
63 ->GetInstalledApp(app_origin);
64 if (!app) { 64 if (!app) {
65 // The app is uninstalled or disabled. 65 // The app is uninstalled or disabled.
66 return std::string(); 66 return std::string();
67 } 67 }
68 return app->id(); 68 return app->id();
69 } 69 }
70 70
71 void ExtensionSyncEventObserver::OnSyncStateUpdated( 71 void ExtensionSyncEventObserver::OnSyncStateUpdated(
72 const GURL& app_origin, 72 const GURL& app_origin,
73 sync_file_system::SyncServiceState state, 73 sync_file_system::SyncServiceState state,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 } 141 }
142 142
143 template <> 143 template <>
144 void BrowserContextKeyedAPIFactory< 144 void BrowserContextKeyedAPIFactory<
145 ExtensionSyncEventObserver>::DeclareFactoryDependencies() { 145 ExtensionSyncEventObserver>::DeclareFactoryDependencies() {
146 DependsOn(sync_file_system::SyncFileSystemServiceFactory::GetInstance()); 146 DependsOn(sync_file_system::SyncFileSystemServiceFactory::GetInstance());
147 DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); 147 DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
148 } 148 }
149 149
150 } // namespace extensions 150 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/first_run/drive_first_run_controller.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698