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

Side by Side Diff: chrome/browser/sync/profile_sync_service.cc

Issue 7837014: [Sync] Change strings to reflect sessions -> open tabs naming convention change (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/sync/profile_sync_service.h" 5 #include "chrome/browser/sync/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 } 569 }
570 NOTREACHED(); 570 NOTREACHED();
571 return NULL; 571 return NULL;
572 } 572 }
573 573
574 // static 574 // static
575 std::string ProfileSyncService::GetExperimentNameForDataType( 575 std::string ProfileSyncService::GetExperimentNameForDataType(
576 syncable::ModelType data_type) { 576 syncable::ModelType data_type) {
577 switch (data_type) { 577 switch (data_type) {
578 case syncable::SESSIONS: 578 case syncable::SESSIONS:
579 return "sync-sessions"; 579 return "sync-tabs";
580 case syncable::TYPED_URLS:
581 return "sync-typed-urls";
582 default: 580 default:
583 break; 581 break;
584 } 582 }
585 NOTREACHED(); 583 NOTREACHED();
586 return ""; 584 return "";
587 } 585 }
588 586
589 void ProfileSyncService::RegisterNewDataType(syncable::ModelType data_type) { 587 void ProfileSyncService::RegisterNewDataType(syncable::ModelType data_type) {
590 if (data_type_controllers_.count(data_type) > 0) 588 if (data_type_controllers_.count(data_type) > 0)
591 return; 589 return;
(...skipping 1022 matching lines...) Expand 10 before | Expand all | Expand 10 after
1614 syncable::ModelTypeBitSetFromValue( 1612 syncable::ModelTypeBitSetFromValue(
1615 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes)); 1613 *profile_->GetPrefs()->GetList(prefs::kAcknowledgedSyncTypes));
1616 syncable::ModelTypeSet registered; 1614 syncable::ModelTypeSet registered;
1617 GetRegisteredDataTypes(&registered); 1615 GetRegisteredDataTypes(&registered);
1618 syncable::ModelTypeBitSet registered_bit_set = 1616 syncable::ModelTypeBitSet registered_bit_set =
1619 syncable::ModelTypeBitSetFromSet(registered); 1617 syncable::ModelTypeBitSetFromSet(registered);
1620 unacknowledged = registered_bit_set & ~acknowledged; 1618 unacknowledged = registered_bit_set & ~acknowledged;
1621 } 1619 }
1622 return unacknowledged; 1620 return unacknowledged;
1623 } 1621 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698