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

Side by Side Diff: components/browser_sync/profile_sync_service.cc

Issue 2958303002: [Sync] Maintain a global_id mapping to update UserEvents that references navigations (Closed)
Patch Set: Hopefully fix iOS compile issue. Created 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/browser_sync/profile_sync_service.h" 5 #include "components/browser_sync/profile_sync_service.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cstddef> 9 #include <cstddef>
10 #include <map> 10 #include <map>
(...skipping 2143 matching lines...) Expand 10 before | Expand all | Expand 10 after
2154 } else { 2154 } else {
2155 // Control Types 2155 // Control Types
2156 helper->OnReceivedNodesForType( 2156 helper->OnReceivedNodesForType(
2157 it.Get(), 2157 it.Get(),
2158 syncer::DirectoryDataTypeController::GetAllNodesForTypeFromDirectory( 2158 syncer::DirectoryDataTypeController::GetAllNodesForTypeFromDirectory(
2159 it.Get(), GetUserShare()->directory.get())); 2159 it.Get(), GetUserShare()->directory.get()));
2160 } 2160 }
2161 } 2161 }
2162 } 2162 }
2163 2163
2164 syncer::GlobalIdMapper* ProfileSyncService::GetGlobalIdMapper() const {
2165 return sessions_sync_manager_.get();
2166 }
2167
2164 base::WeakPtr<syncer::JsController> ProfileSyncService::GetJsController() { 2168 base::WeakPtr<syncer::JsController> ProfileSyncService::GetJsController() {
2165 DCHECK(thread_checker_.CalledOnValidThread()); 2169 DCHECK(thread_checker_.CalledOnValidThread());
2166 return sync_js_controller_.AsWeakPtr(); 2170 return sync_js_controller_.AsWeakPtr();
2167 } 2171 }
2168 2172
2169 // static 2173 // static
2170 void ProfileSyncService::SyncEvent(SyncEventCodes code) { 2174 void ProfileSyncService::SyncEvent(SyncEventCodes code) {
2171 UMA_HISTOGRAM_ENUMERATION("Sync.EventCodes", code, MAX_SYNC_EVENT_CODE); 2175 UMA_HISTOGRAM_ENUMERATION("Sync.EventCodes", code, MAX_SYNC_EVENT_CODE);
2172 } 2176 }
2173 2177
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
2428 return; 2432 return;
2429 2433
2430 DCHECK(startup_controller_->IsSetupInProgress()); 2434 DCHECK(startup_controller_->IsSetupInProgress());
2431 startup_controller_->SetSetupInProgress(false); 2435 startup_controller_->SetSetupInProgress(false);
2432 2436
2433 if (IsEngineInitialized()) 2437 if (IsEngineInitialized())
2434 ReconfigureDatatypeManager(); 2438 ReconfigureDatatypeManager();
2435 NotifyObservers(); 2439 NotifyObservers();
2436 } 2440 }
2437 } // namespace browser_sync 2441 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698