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

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 470693003: Cleanup: Remove more unneeded ifdefs in chrome/browser/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/extensions/data_deleter.cc ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 6a2d1455d6b2efae53d9b48b39cc1110f91e0168..5ea0e30695bc0876d96e4d6608b14aa67eade0e8 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -116,14 +116,12 @@ namespace {
// Wait this many seconds after an extensions becomes idle before updating it.
const int kUpdateIdleDelay = 5;
-#if defined(ENABLE_EXTENSIONS)
scoped_ptr<IdentityProvider> CreateWebstoreIdentityProvider(Profile* profile) {
return make_scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
SigninManagerFactory::GetForProfile(profile),
ProfileOAuth2TokenServiceFactory::GetForProfile(profile),
LoginUIServiceFactory::GetForProfile(profile)));
}
-#endif // defined(ENABLE_EXTENSIONS)
} // namespace
@@ -589,14 +587,12 @@ bool ExtensionService::UpdateExtension(const std::string& id,
scoped_ptr<ExtensionDownloader> ExtensionService::CreateExtensionDownloader(
ExtensionDownloaderDelegate* delegate) {
scoped_ptr<ExtensionDownloader> downloader;
-#if defined(ENABLE_EXTENSIONS)
scoped_ptr<IdentityProvider> identity_provider =
CreateWebstoreIdentityProvider(profile_);
downloader.reset(new ExtensionDownloader(
delegate,
profile_->GetRequestContext()));
downloader->SetWebstoreIdentityProvider(identity_provider.Pass());
-#endif
return downloader.Pass();
}
« no previous file with comments | « chrome/browser/extensions/data_deleter.cc ('k') | chrome/browser/extensions/external_component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698