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

Side by Side Diff: chrome/browser/sync_file_system/drive_file_sync_service.cc

Issue 13145003: Rewrite std::string("") to std::string(), Linux edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ugh Created 7 years, 8 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) 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 "chrome/browser/sync_file_system/drive_file_sync_service.h" 5 #include "chrome/browser/sync_file_system/drive_file_sync_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 } 404 }
405 405
406 EnsureOriginRootDirectory( 406 EnsureOriginRootDirectory(
407 origin, base::Bind(&DriveFileSyncService::DidGetDriveDirectoryForOrigin, 407 origin, base::Bind(&DriveFileSyncService::DidGetDriveDirectoryForOrigin,
408 AsWeakPtr(), base::Passed(&token), origin, callback)); 408 AsWeakPtr(), base::Passed(&token), origin, callback));
409 } 409 }
410 410
411 void DriveFileSyncService::UnregisterOriginForTrackingChanges( 411 void DriveFileSyncService::UnregisterOriginForTrackingChanges(
412 const GURL& origin, 412 const GURL& origin,
413 const SyncStatusCallback& callback) { 413 const SyncStatusCallback& callback) {
414 scoped_ptr<TaskToken> token(GetToken(FROM_HERE, TASK_TYPE_DATABASE, "")); 414 scoped_ptr<TaskToken> token(
415 GetToken(FROM_HERE, TASK_TYPE_DATABASE, std::string()));
415 if (!token) { 416 if (!token) {
416 pending_tasks_.push_back(base::Bind( 417 pending_tasks_.push_back(base::Bind(
417 &DriveFileSyncService::UnregisterOriginForTrackingChanges, 418 &DriveFileSyncService::UnregisterOriginForTrackingChanges,
418 AsWeakPtr(), origin, callback)); 419 AsWeakPtr(), origin, callback));
419 return; 420 return;
420 } 421 }
421 422
422 // TODO(nhiroki): Add helper function to forget remote changes for the given 423 // TODO(nhiroki): Add helper function to forget remote changes for the given
423 // origin like "ForgetRemoteChangesForOrigin(origin)". 424 // origin like "ForgetRemoteChangesForOrigin(origin)".
424 // http://crbug.com/211600 425 // http://crbug.com/211600
(...skipping 10 matching lines...) Expand all
435 &DriveFileSyncService::DidChangeOriginOnMetadataStore, 436 &DriveFileSyncService::DidChangeOriginOnMetadataStore,
436 AsWeakPtr(), base::Passed(&token), callback)); 437 AsWeakPtr(), base::Passed(&token), callback));
437 } 438 }
438 439
439 void DriveFileSyncService::EnableOriginForTrackingChanges( 440 void DriveFileSyncService::EnableOriginForTrackingChanges(
440 const GURL& origin, 441 const GURL& origin,
441 const SyncStatusCallback& callback) { 442 const SyncStatusCallback& callback) {
442 if (!metadata_store_->IsOriginDisabled(origin)) 443 if (!metadata_store_->IsOriginDisabled(origin))
443 return; 444 return;
444 445
445 scoped_ptr<TaskToken> token(GetToken(FROM_HERE, TASK_TYPE_DATABASE, "")); 446 scoped_ptr<TaskToken> token(
447 GetToken(FROM_HERE, TASK_TYPE_DATABASE, std::string()));
446 if (!token) { 448 if (!token) {
447 pending_tasks_.push_back(base::Bind( 449 pending_tasks_.push_back(base::Bind(
448 &DriveFileSyncService::EnableOriginForTrackingChanges, 450 &DriveFileSyncService::EnableOriginForTrackingChanges,
449 AsWeakPtr(), origin, callback)); 451 AsWeakPtr(), origin, callback));
450 return; 452 return;
451 } 453 }
452 454
453 metadata_store_->EnableOrigin(origin, base::Bind( 455 metadata_store_->EnableOrigin(origin, base::Bind(
454 &DriveFileSyncService::DidChangeOriginOnMetadataStore, 456 &DriveFileSyncService::DidChangeOriginOnMetadataStore,
455 AsWeakPtr(), base::Passed(&token), callback)); 457 AsWeakPtr(), base::Passed(&token), callback));
456 pending_batch_sync_origins_.insert(origin); 458 pending_batch_sync_origins_.insert(origin);
457 } 459 }
458 460
459 void DriveFileSyncService::DisableOriginForTrackingChanges( 461 void DriveFileSyncService::DisableOriginForTrackingChanges(
460 const GURL& origin, 462 const GURL& origin,
461 const SyncStatusCallback& callback) { 463 const SyncStatusCallback& callback) {
462 if (!metadata_store_->IsBatchSyncOrigin(origin) && 464 if (!metadata_store_->IsBatchSyncOrigin(origin) &&
463 !metadata_store_->IsIncrementalSyncOrigin(origin)) 465 !metadata_store_->IsIncrementalSyncOrigin(origin))
464 return; 466 return;
465 467
466 scoped_ptr<TaskToken> token(GetToken(FROM_HERE, TASK_TYPE_DATABASE, "")); 468 scoped_ptr<TaskToken> token(
469 GetToken(FROM_HERE, TASK_TYPE_DATABASE, std::string()));
467 if (!token) { 470 if (!token) {
468 pending_tasks_.push_back(base::Bind( 471 pending_tasks_.push_back(base::Bind(
469 &DriveFileSyncService::DisableOriginForTrackingChanges, 472 &DriveFileSyncService::DisableOriginForTrackingChanges,
470 AsWeakPtr(), origin, callback)); 473 AsWeakPtr(), origin, callback));
471 return; 474 return;
472 } 475 }
473 476
474 // TODO(nhiroki): Add helper function to forget remote changes for the given 477 // TODO(nhiroki): Add helper function to forget remote changes for the given
475 // origin like "ForgetRemoteChangesForOrigin(origin)". 478 // origin like "ForgetRemoteChangesForOrigin(origin)".
476 // http://crbug.com/211600 479 // http://crbug.com/211600
(...skipping 1999 matching lines...) Expand 10 before | Expand all | Expand 10 after
2476 pending_batch_sync_origins_.insert(origin); 2479 pending_batch_sync_origins_.insert(origin);
2477 } 2480 }
2478 callback.Run(status, resource_id); 2481 callback.Run(status, resource_id);
2479 } 2482 }
2480 2483
2481 std::string DriveFileSyncService::sync_root_resource_id() { 2484 std::string DriveFileSyncService::sync_root_resource_id() {
2482 return metadata_store_->sync_root_directory(); 2485 return metadata_store_->sync_root_directory();
2483 } 2486 }
2484 2487
2485 } // namespace sync_file_system 2488 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698