summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser.gypi
diff options
context:
space:
mode:
authorBalazs Engedy <engedy@chromium.org>2014-09-18 12:40:18 +0200
committerBalazs Engedy <engedy@chromium.org>2014-09-18 10:42:59 +0000
commit9d0221cd251502231877f943fa2872a2f92a5621 (patch)
tree7a12b382678a523747bfe4b25583d416a67d6042 /chrome/chrome_browser.gypi
parent96297a73c48ff299e45eac62b967a8e333569602 (diff)
downloadchromium_src-9d0221cd251502231877f943fa2872a2f92a5621.zip
chromium_src-9d0221cd251502231877f943fa2872a2f92a5621.tar.gz
chromium_src-9d0221cd251502231877f943fa2872a2f92a5621.tar.bz2
Revert "Eliminate all code related to the AutomaticProfileResetter."
This reverts commit: https://chromium.googlesource.com/chromium/src/+/93ea39da5423d641ecbc5687764f6b12972e302a. Additionally, it also changes the |first_id| for the string resource group chrome/browser/browser_resources.grd / "includes", because the group has ran out of IDs. BUG=370966 NOPRESUBMIT=true R=asvitkine@chromium.org, dbeam@chromium.org, erg@chromium.org, gab@chromium.org, sky@chromium.org, vasilii@chromium.org Review URL: https://codereview.chromium.org/533183002 Cr-Commit-Position: refs/heads/master@{#295450}
Diffstat (limited to 'chrome/chrome_browser.gypi')
-rw-r--r--chrome/chrome_browser.gypi15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 3dd8d103..bed6356d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2093,10 +2093,25 @@
'browser/process_singleton_posix.cc',
'browser/process_singleton_startup_lock.cc',
'browser/process_singleton_startup_lock.h',
+ 'browser/profile_resetter/automatic_profile_resetter.cc',
+ 'browser/profile_resetter/automatic_profile_resetter_delegate.cc',
+ 'browser/profile_resetter/automatic_profile_resetter_delegate.h',
+ 'browser/profile_resetter/automatic_profile_resetter_factory.cc',
+ 'browser/profile_resetter/automatic_profile_resetter_factory.h',
+ 'browser/profile_resetter/automatic_profile_resetter.h',
+ 'browser/profile_resetter/automatic_profile_resetter_mementos.cc',
+ 'browser/profile_resetter/automatic_profile_resetter_mementos.h',
'browser/profile_resetter/brandcode_config_fetcher.cc',
'browser/profile_resetter/brandcode_config_fetcher.h',
'browser/profile_resetter/brandcoded_default_settings.cc',
'browser/profile_resetter/brandcoded_default_settings.h',
+ 'browser/profile_resetter/jtl_foundation.cc',
+ 'browser/profile_resetter/jtl_foundation.h',
+ 'browser/profile_resetter/jtl_instructions.h',
+ 'browser/profile_resetter/jtl_interpreter.cc',
+ 'browser/profile_resetter/jtl_interpreter.h',
+ 'browser/profile_resetter/profile_reset_global_error.cc',
+ 'browser/profile_resetter/profile_reset_global_error.h',
'browser/profile_resetter/profile_resetter.cc',
'browser/profile_resetter/profile_resetter.h',
'browser/profile_resetter/resettable_settings_snapshot.cc',