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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 10783006: Removing ENABLE_PROMO_RESOURCE_SERVICE guards (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: TODO to remove kNtpCustomLogo Created 8 years, 5 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/profiles/profile_impl.h ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 966d5b307dc6fa308f02db9cb2485193f4dc98ab..36e24cb81346853aacea9b1fc9952951babe1eec 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -72,6 +72,7 @@
#include "chrome/browser/user_style_sheet_watcher.h"
#include "chrome/browser/visitedlink/visitedlink_event_listener.h"
#include "chrome/browser/visitedlink/visitedlink_master.h"
+#include "chrome/browser/web_resource/promo_resource_service.h"
#include "chrome/browser/webdata/web_data_service.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_notification_types.h"
@@ -95,10 +96,6 @@
#include "chrome/browser/policy/policy_service_stub.h"
#endif // defined(ENABLE_CONFIGURATION_POLICY)
-#if defined(ENABLE_PROMO_RESOURCE_SERVICE)
-#include "chrome/browser/web_resource/promo_resource_service.h"
-#endif // defined(ENABLE_PROMO_RESOURCE_SERVICE)
-
#if defined(OS_WIN)
#include "chrome/installer/util/install_util.h"
#endif
@@ -450,13 +447,10 @@ void ProfileImpl::InitHostZoomMap() {
}
void ProfileImpl::InitPromoResources() {
-#if defined(ENABLE_PROMO_RESOURCE_SERVICE)
if (promo_resource_service_)
return;
-
promo_resource_service_ = new PromoResourceService(this);
promo_resource_service_->StartAfterDelay();
-#endif
}
void ProfileImpl::InitRegisteredProtocolHandlers() {
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/ui/webui/ntp/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698