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

Side by Side Diff: sync/internal_api/sync_manager_impl.cc

Issue 1136643004: Switch remaining functions from SchemeIsSecure() to SchemeIsCryptographic(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebasing. Created 5 years, 7 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 "sync/internal_api/sync_manager_impl.h" 5 #include "sync/internal_api/sync_manager_impl.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 DVLOG(1) << "Username: " << username; 284 DVLOG(1) << "Username: " << username;
285 if (!OpenDirectory(username)) { 285 if (!OpenDirectory(username)) {
286 NotifyInitializationFailure(); 286 NotifyInitializationFailure();
287 LOG(ERROR) << "Sync manager initialization failed!"; 287 LOG(ERROR) << "Sync manager initialization failed!";
288 return; 288 return;
289 } 289 }
290 290
291 connection_manager_.reset(new SyncAPIServerConnectionManager( 291 connection_manager_.reset(new SyncAPIServerConnectionManager(
292 args->service_url.host() + args->service_url.path(), 292 args->service_url.host() + args->service_url.path(),
293 args->service_url.EffectiveIntPort(), 293 args->service_url.EffectiveIntPort(),
294 args->service_url.SchemeIsSecure(), 294 args->service_url.SchemeIsCryptographic(), args->post_factory.release(),
295 args->post_factory.release(),
296 args->cancelation_signal)); 295 args->cancelation_signal));
297 connection_manager_->set_client_id(directory()->cache_guid()); 296 connection_manager_->set_client_id(directory()->cache_guid());
298 connection_manager_->AddListener(this); 297 connection_manager_->AddListener(this);
299 298
300 std::string sync_id = directory()->cache_guid(); 299 std::string sync_id = directory()->cache_guid();
301 300
302 DVLOG(1) << "Setting sync client ID: " << sync_id; 301 DVLOG(1) << "Setting sync client ID: " << sync_id;
303 allstatus_.SetSyncId(sync_id); 302 allstatus_.SetSyncId(sync_id);
304 DVLOG(1) << "Setting invalidator client ID: " << args->invalidator_client_id; 303 DVLOG(1) << "Setting invalidator client ID: " << args->invalidator_client_id;
305 allstatus_.SetInvalidatorClientId(args->invalidator_client_id); 304 allstatus_.SetInvalidatorClientId(args->invalidator_client_id);
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
1024 bool SyncManagerImpl::HasDirectoryTypeDebugInfoObserver( 1023 bool SyncManagerImpl::HasDirectoryTypeDebugInfoObserver(
1025 syncer::TypeDebugInfoObserver* observer) { 1024 syncer::TypeDebugInfoObserver* observer) {
1026 return model_type_registry_->HasDirectoryTypeDebugInfoObserver(observer); 1025 return model_type_registry_->HasDirectoryTypeDebugInfoObserver(observer);
1027 } 1026 }
1028 1027
1029 void SyncManagerImpl::RequestEmitDebugInfo() { 1028 void SyncManagerImpl::RequestEmitDebugInfo() {
1030 model_type_registry_->RequestEmitDebugInfo(); 1029 model_type_registry_->RequestEmitDebugInfo();
1031 } 1030 }
1032 1031
1033 } // namespace syncer 1032 } // namespace syncer
OLDNEW
« no previous file with comments | « remoting/host/third_party_auth_config.cc ('k') | third_party/libaddressinput/chromium/chrome_metadata_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698