summaryrefslogtreecommitdiffstats
path: root/sync/util
diff options
context:
space:
mode:
authorisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 20:44:08 +0000
committerisherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-14 20:44:08 +0000
commit40b557585ef701b616cb4d9858f260468972cc79 (patch)
tree4ca9add1ed77100c8623ce4202079ccd5e9042bb /sync/util
parentbfb4d6721cbf094b286e36f69bf43aa14d69de9c (diff)
downloadchromium_src-40b557585ef701b616cb4d9858f260468972cc79.zip
chromium_src-40b557585ef701b616cb4d9858f260468972cc79.tar.gz
chromium_src-40b557585ef701b616cb4d9858f260468972cc79.tar.bz2
Revert 182527
Caused compile failure on Win Aura > [Sync] Make SESSIONS an implicit type > > We add TABS as a new local type, which is now what is enabled via the user > settings. It implicitly enables SESSIONS. > > Similarly, History now corresponds with Typed URLs, which implicitly enables > history delete directives if the proper command line flag is passed. > > Finally, History delete directives implicitly enables SESSIONS, which we can do > because Sessions is no longer a user selectable type. > > BUG=170162 > TBR=jhawkins@chromium.org > > Review URL: https://chromiumcodereview.appspot.com/11961030 TBR=zea@chromium.org Review URL: https://codereview.chromium.org/12271002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/util')
-rw-r--r--sync/util/data_type_histogram.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/sync/util/data_type_histogram.h b/sync/util/data_type_histogram.h
index 75e833e..e72cebb 100644
--- a/sync/util/data_type_histogram.h
+++ b/sync/util/data_type_histogram.h
@@ -99,9 +99,6 @@
case ::syncer::DICTIONARY: \
PER_DATA_TYPE_MACRO("Dictionary"); \
break; \
- case ::syncer::PROXY_TABS :\
- PER_DATA_TYPE_MACRO("Tabs"); \
- break; \
default: \
NOTREACHED() << "Unknown datatype " \
<< ::syncer::ModelTypeToString(datatype); \