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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/sync_engine.cc

Issue 861133002: Remove WAPI-related code, except the type definition of ResourceEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Respond to review comments. Created 5 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_backend/sync_engine.h" 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 #include "chrome/browser/sync_file_system/logger.h" 45 #include "chrome/browser/sync_file_system/logger.h"
46 #include "chrome/browser/sync_file_system/syncable_file_system_util.h" 46 #include "chrome/browser/sync_file_system/syncable_file_system_util.h"
47 #include "components/signin/core/browser/profile_oauth2_token_service.h" 47 #include "components/signin/core/browser/profile_oauth2_token_service.h"
48 #include "components/signin/core/browser/signin_manager.h" 48 #include "components/signin/core/browser/signin_manager.h"
49 #include "content/public/browser/browser_thread.h" 49 #include "content/public/browser/browser_thread.h"
50 #include "extensions/browser/extension_system.h" 50 #include "extensions/browser/extension_system.h"
51 #include "extensions/browser/extension_system_provider.h" 51 #include "extensions/browser/extension_system_provider.h"
52 #include "extensions/browser/extensions_browser_client.h" 52 #include "extensions/browser/extensions_browser_client.h"
53 #include "extensions/common/extension.h" 53 #include "extensions/common/extension.h"
54 #include "google_apis/drive/drive_api_url_generator.h" 54 #include "google_apis/drive/drive_api_url_generator.h"
55 #include "google_apis/drive/gdata_wapi_url_generator.h"
56 #include "net/url_request/url_request_context_getter.h" 55 #include "net/url_request/url_request_context_getter.h"
57 #include "storage/common/blob/scoped_file.h" 56 #include "storage/common/blob/scoped_file.h"
58 #include "storage/common/fileapi/file_system_util.h" 57 #include "storage/common/fileapi/file_system_util.h"
59 58
60 namespace sync_file_system { 59 namespace sync_file_system {
61 60
62 class RemoteChangeProcessor; 61 class RemoteChangeProcessor;
63 62
64 namespace drive_backend { 63 namespace drive_backend {
65 64
66 scoped_ptr<drive::DriveServiceInterface> 65 scoped_ptr<drive::DriveServiceInterface>
67 SyncEngine::DriveServiceFactory::CreateDriveService( 66 SyncEngine::DriveServiceFactory::CreateDriveService(
68 OAuth2TokenService* oauth2_token_service, 67 OAuth2TokenService* oauth2_token_service,
69 net::URLRequestContextGetter* url_request_context_getter, 68 net::URLRequestContextGetter* url_request_context_getter,
70 base::SequencedTaskRunner* blocking_task_runner) { 69 base::SequencedTaskRunner* blocking_task_runner) {
71 return scoped_ptr<drive::DriveServiceInterface>( 70 return scoped_ptr<drive::DriveServiceInterface>(
72 new drive::DriveAPIService( 71 new drive::DriveAPIService(
73 oauth2_token_service, 72 oauth2_token_service,
74 url_request_context_getter, 73 url_request_context_getter,
75 blocking_task_runner, 74 blocking_task_runner,
76 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction), 75 GURL(google_apis::DriveApiUrlGenerator::kBaseUrlForProduction),
77 GURL(google_apis::DriveApiUrlGenerator:: 76 GURL(google_apis::DriveApiUrlGenerator::
78 kBaseDownloadUrlForProduction), 77 kBaseDownloadUrlForProduction),
79 GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
80 std::string() /* custom_user_agent */)); 78 std::string() /* custom_user_agent */));
81 } 79 }
82 80
83 class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer { 81 class SyncEngine::WorkerObserver : public SyncWorkerInterface::Observer {
84 public: 82 public:
85 WorkerObserver(base::SequencedTaskRunner* ui_task_runner, 83 WorkerObserver(base::SequencedTaskRunner* ui_task_runner,
86 base::WeakPtr<SyncEngine> sync_engine) 84 base::WeakPtr<SyncEngine> sync_engine)
87 : ui_task_runner_(ui_task_runner), 85 : ui_task_runner_(ui_task_runner),
88 sync_engine_(sync_engine) { 86 sync_engine_(sync_engine) {
89 sequence_checker_.DetachFromSequence(); 87 sequence_checker_.DetachFromSequence();
(...skipping 712 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 800
803 SyncStatusCallback SyncEngine::TrackCallback( 801 SyncStatusCallback SyncEngine::TrackCallback(
804 const SyncStatusCallback& callback) { 802 const SyncStatusCallback& callback) {
805 return callback_tracker_.Register( 803 return callback_tracker_.Register(
806 base::Bind(callback, SYNC_STATUS_ABORT), 804 base::Bind(callback, SYNC_STATUS_ABORT),
807 callback); 805 callback);
808 } 806 }
809 807
810 } // namespace drive_backend 808 } // namespace drive_backend
811 } // namespace sync_file_system 809 } // namespace sync_file_system
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698